diff options
| author | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
|---|---|---|
| committer | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
| commit | a11dfce7a25fb7de61f3306c25d833710fdb316b (patch) | |
| tree | 887dd555500536c150c4a656732da6bde9443082 /target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch | |
| parent | c69fa28f0f3a6704f63e8b5316e5a292223f27d9 (diff) | |
[generic-2.6] Remove files now present upstream in files-2.6.25
(This is mostly just drivers/ssb and include/linux/ssb)
[brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set
Default is still to build against 2.6.23.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 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 | 38 |
1 files changed, 19 insertions, 19 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 eea4e2602..ae66ab7a6 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,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/Kconfig +Index: linux-2.6.25/arch/mips/Kconfig =================================================================== ---- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-13 02:23:41.484492317 +0200 -+++ linux-2.6.23/arch/mips/Kconfig 2007-10-13 02:47:02.784347843 +0200 -@@ -192,7 +192,6 @@ +--- linux-2.6.25.orig/arch/mips/Kconfig 2008-04-26 21:57:10.000000000 +0100 ++++ linux-2.6.25/arch/mips/Kconfig 2008-04-26 21:57:13.000000000 +0100 +@@ -228,7 +228,6 @@ config MIPS_MALTA select I8259 select MIPS_BOARDS_GEN select MIPS_BONITO64 @@ -10,7 +10,7 @@ Index: linux-2.6.23/arch/mips/Kconfig select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1281,13 +1280,6 @@ +@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE @@ -24,11 +24,11 @@ Index: linux-2.6.23/arch/mips/Kconfig config R5000_CPU_SCACHE bool select BOARD_SCACHE -Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c +Index: linux-2.6.25/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:11.210767122 +0200 -+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:47:02.788348072 +0200 -@@ -701,6 +701,8 @@ +--- linux-2.6.25.orig/arch/mips/kernel/cpu-probe.c 2008-04-26 21:56:21.000000000 +0100 ++++ linux-2.6.25/arch/mips/kernel/cpu-probe.c 2008-04-26 21:57:13.000000000 +0100 +@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct break; case PRID_IMP_25KF: c->cputype = CPU_25KF; @@ -37,19 +37,19 @@ Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c break; case PRID_IMP_34K: c->cputype = CPU_34K; -Index: linux-2.6.23/arch/mips/mm/c-r4k.c +Index: linux-2.6.25/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/c-r4k.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/c-r4k.c 2007-10-13 02:47:02.792348301 +0200 -@@ -1086,7 +1086,6 @@ +--- linux-2.6.25.orig/arch/mips/mm/c-r4k.c 2008-04-26 21:56:21.000000000 +0100 ++++ linux-2.6.25/arch/mips/mm/c-r4k.c 2008-04-26 22:08:15.000000000 +0100 +@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi extern int r5k_sc_init(void); extern int rm7k_sc_init(void); -extern int mips_sc_init(void); - static void __init setup_scache(void) + static void __cpuinit setup_scache(void) { -@@ -1140,29 +1139,17 @@ +@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void) #endif default: @@ -84,11 +84,11 @@ Index: linux-2.6.23/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.23/arch/mips/mm/Makefile +Index: linux-2.6.25/arch/mips/mm/Makefile =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/Makefile 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/Makefile 2007-10-13 02:47:23.393522295 +0200 -@@ -31,6 +31,5 @@ +--- linux-2.6.25.orig/arch/mips/mm/Makefile 2008-04-26 21:56:21.000000000 +0100 ++++ linux-2.6.25/arch/mips/mm/Makefile 2008-04-26 21:57:13.000000000 +0100 +@@ -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 |