diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
| commit | a4ffbea09c88fbe9cefcf0080eda0809598f3ee1 (patch) | |
| tree | f3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch | |
| parent | d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (diff) | |
| download | upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.gz upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.bz2 upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.zip | |
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch index d36b4d8307..941b649c7f 100644 --- a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -228,7 +228,6 @@ +@@ -228,7 +228,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 -@@ -1421,13 +1420,6 @@ +@@ -1421,13 +1420,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 -@@ -704,6 +704,8 @@ +@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct break; case PRID_IMP_25KF: c->cputype = CPU_25KF; @@ -35,7 +35,7 @@ c->cputype = CPU_34K; --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -1103,7 +1103,6 @@ +@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi extern int r5k_sc_init(void); extern int rm7k_sc_init(void); @@ -43,7 +43,7 @@ static void __cpuinit setup_scache(void) { -@@ -1157,29 +1156,17 @@ +@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void) #endif default: @@ -80,7 +80,7 @@ --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile -@@ -32,6 +32,5 @@ +@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex- obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o |