bcm47xx compile fix for .21, thanks to noz

[openwrt/svn-archive/archive.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 f56f72f176478d2a827c727058c9055acc6d57a8..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,7 +1,7 @@
 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
-@@ -283,7 +283,6 @@
+@@ -315,7 +315,6 @@
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
@@ -9,7 +9,7 @@ diff -urN linux-2.6.19.ref/arch/mips/Kconfig linux-2.6.19/arch/mips/Kconfig
        select MIPS_GT64120
        select MIPS_MSC
        select SWAP_IO_SPACE
-@@ -1434,13 +1433,6 @@
+@@ -1538,13 +1537,6 @@
        bool
        select BOARD_SCACHE
  
@@ -26,7 +26,7 @@ diff -urN linux-2.6.19.ref/arch/mips/Kconfig linux-2.6.19/arch/mips/Kconfig
 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
-@@ -631,6 +631,8 @@
+@@ -619,6 +619,8 @@
                break;
        case PRID_IMP_25KF:
                c->cputype = CPU_25KF;
@@ -84,11 +84,8 @@ diff -urN linux-2.6.19.ref/arch/mips/mm/c-r4k.c linux-2.6.19/arch/mips/mm/c-r4k.
 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,7 +30,6 @@
+@@ -30,4 +30,3 @@
  obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
  obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
  obj-$(CONFIG_RM7000_CPU_SCACHE)       += sc-rm7k.o
 -obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
- 
- #
- # Choose one DMA coherency model