summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-02-20 19:31:13 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-02-20 19:31:13 +0000
commit1a3de32e6815324dc0670c2b7a161b3d1fe91828 (patch)
tree0ec39aad865da4f5bfe5ea404199055adde552d1 /target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch
parent31510cc4721afbff51e52541a23170f53e01ed4c (diff)
[brcm47xx] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19781 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch
index 4ed30486d2..b649ec3440 100644
--- a/target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/130-remove_scache.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -195,7 +195,6 @@ config MIPS_MALTA
+@@ -216,7 +216,6 @@ config MIPS_MALTA
select I8259
select MIPS_BOARDS_GEN
select MIPS_BONITO64
@@ -8,7 +8,7 @@
select PCI_GT64XXX_PCI0
select MIPS_MSC
select SWAP_IO_SPACE
-@@ -1473,13 +1472,6 @@ config IP22_CPU_SCACHE
+@@ -1523,13 +1522,6 @@ config IP22_CPU_SCACHE
bool
select BOARD_SCACHE
@@ -24,7 +24,7 @@
select BOARD_SCACHE
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
-@@ -753,6 +753,8 @@ static inline void cpu_probe_mips(struct
+@@ -748,6 +748,8 @@ static inline void cpu_probe_mips(struct
case PRID_IMP_25KF:
c->cputype = CPU_25KF;
__cpu_name[cpu] = "MIPS 25Kc";
@@ -35,7 +35,7 @@
c->cputype = CPU_34K;
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
-@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-oct
+@@ -33,6 +33,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-oct
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
@@ -44,7 +44,7 @@
EXTRA_CFLAGS += -Werror
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
-@@ -1135,7 +1135,6 @@ static void __init loongson2_sc_init(voi
+@@ -1148,7 +1148,6 @@ static void __init loongson2_sc_init(voi
extern int r5k_sc_init(void);
extern int rm7k_sc_init(void);
@@ -52,7 +52,7 @@
static void __cpuinit setup_scache(void)
{
-@@ -1189,29 +1188,17 @@ static void __cpuinit setup_scache(void)
+@@ -1202,29 +1201,17 @@ static void __cpuinit setup_scache(void)
#endif
default: