set the kernel version of brcm47xx-2.6 in the target makefile, keep patch compatibili...

[openwrt/openwrt.git] / target / linux / brcm47xx-2.6 / patches / 130-remove_scache.patch

diff --git a/target/linux/brcm47xx-2.6/patches/130-remove_scache.patch b/target/linux/brcm47xx-2.6/patches/130-remove_scache.patch
index ed821843bef1b59a80e4f6c3bb9e10d1fb34ccf0..1f3b250c4218329037f3967d5b83c0e9aa399099 100644 (file)
--- a/target/linux/brcm47xx-2.6/patches/130-remove_scache.patch
+++ b/target/linux/brcm47xx-2.6/patches/130-remove_scache.patch
@@ -1,16 +1,15 @@
-Index: linux-2.6.22-rc4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.22-rc4.orig/arch/mips/Kconfig    2007-06-10 21:33:12.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/Kconfig 2007-06-10 21:33:17.000000000 +0100
-@@ -202,7 +202,6 @@
+diff -urN linux-2.6.19.ref/arch/mips/Kconfig linux-2.6.19/arch/mips/Kconfig
+--- linux-2.6.19.ref/arch/mips/Kconfig 2006-12-04 21:33:48.000000000 +0100
++++ linux-2.6.19/arch/mips/Kconfig     2006-12-04 21:34:04.000000000 +0100
+@@ -315,7 +315,6 @@
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
 -      select MIPS_CPU_SCACHE
-       select PCI_GT64XXX_PCI0
+       select MIPS_GT64120
        select MIPS_MSC
        select SWAP_IO_SPACE
-@@ -1345,13 +1344,6 @@
+@@ -1538,13 +1537,6 @@
        bool
        select BOARD_SCACHE
  
@@ -24,10 +23,9 @@ Index: linux-2.6.22-rc4/arch/mips/Kconfig
  config R5000_CPU_SCACHE
        bool
        select BOARD_SCACHE
-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:12.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c      2007-06-10 21:33:17.000000000 +0100
+diff -urN linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c linux-2.6.19/arch/mips/kernel/cpu-probe.c
+--- linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c      2006-12-04 21:33:48.000000000 +0100
++++ linux-2.6.19/arch/mips/kernel/cpu-probe.c  2006-12-04 21:34:04.000000000 +0100
 @@ -619,6 +619,8 @@
                break;
        case PRID_IMP_25KF:
@@ -37,10 +35,9 @@ Index: linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c
                break;
        case PRID_IMP_34K:
                c->cputype = CPU_34K;
-Index: linux-2.6.22-rc4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.22-rc4.orig/arch/mips/mm/c-r4k.c 2007-06-10 21:32:13.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/mm/c-r4k.c      2007-06-10 21:33:17.000000000 +0100
+diff -urN linux-2.6.19.ref/arch/mips/mm/c-r4k.c linux-2.6.19/arch/mips/mm/c-r4k.c
+--- linux-2.6.19.ref/arch/mips/mm/c-r4k.c      2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19/arch/mips/mm/c-r4k.c  2006-12-04 21:34:04.000000000 +0100
 @@ -1038,7 +1038,6 @@
  
  extern int r5k_sc_init(void);
@@ -84,10 +81,9 @@ Index: linux-2.6.22-rc4/arch/mips/mm/c-r4k.c
        /* compute a couple of other cache variables */
        c->scache.waysize = scache_size / c->scache.ways;
  
-Index: linux-2.6.22-rc4/arch/mips/mm/Makefile
-===================================================================
---- linux-2.6.22-rc4.orig/arch/mips/mm/Makefile        2007-06-10 21:32:13.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/mm/Makefile     2007-06-10 21:33:17.000000000 +0100
+diff -urN linux-2.6.19.ref/arch/mips/mm/Makefile linux-2.6.19/arch/mips/mm/Makefile
+--- linux-2.6.19.ref/arch/mips/mm/Makefile     2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19/arch/mips/mm/Makefile 2006-12-04 21:34:04.000000000 +0100
 @@ -30,4 +30,3 @@
  obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
  obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o