refresh patches
SVN-Revision: 19781
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user