From 7c8b1b3691855e80d640aed28b5160ecfde4b67e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jun 2007 23:41:09 +0000 Subject: set the kernel version of brcm47xx-2.6 in the target makefile, keep patch compatibility with 2.6.21.5 in case we need to revert before the next release git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7698 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch') diff --git a/target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch b/target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch index 92bf0a37e0..ce37b1343e 100644 --- a/target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch +++ b/target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch @@ -1,13 +1,12 @@ -Index: linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c -=================================================================== ---- linux-2.6.22-rc4.orig/arch/mips/kernel/cpu-probe.c 2007-06-10 21:33:17.000000000 +0100 -+++ linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c 2007-06-10 21:33:22.000000000 +0100 +diff -urN linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c linux-2.6.19.2/arch/mips/kernel/cpu-probe.c +--- linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c 2007-05-01 19:28:06.937756121 +0100 ++++ linux-2.6.19.2/arch/mips/kernel/cpu-probe.c 2007-05-01 19:31:46.867756121 +0100 @@ -143,6 +143,8 @@ case CPU_34K: case CPU_74K: case CPU_PR4450: + case CPU_BCM3302: -+ case CPU_BCM4710: ++ case CPU_BCM4710: cpu_wait = r4k_wait; break; - case CPU_TX49XX: + case CPU_TX49XX: -- cgit v1.2.3