aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-09-03 18:56:07 -0400
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 03:06:03 -0400
commitab1418a31619a47d78843c20b5fa2245c29824ca (patch)
tree93b3608b8b46459e9c91ff443504c577f63b6c87 /arch/mips
parent0ad7305f52bc8880d50a6471c90d35a6768f2865 (diff)
[PATCH] more vr4181 removal
Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig12
-rw-r--r--arch/mips/kernel/cpu-probe.c6
2 files changed, 1 insertions, 17 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 898de2df1fc7..e82d9240ea8e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -445,11 +445,6 @@ config DDB5477_BUS_FREQUENCY
445 depends on DDB5477 445 depends on DDB5477
446 default 0 446 default 0
447 447
448config NEC_OSPREY
449 bool "Support for NEC Osprey board"
450 select DMA_NONCOHERENT
451 select IRQ_CPU
452
453config SGI_IP22 448config SGI_IP22
454 bool "Support for SGI IP22 (Indy/Indigo2)" 449 bool "Support for SGI IP22 (Indy/Indigo2)"
455 select ARC 450 select ARC
@@ -974,7 +969,7 @@ config MIPS_DISABLE_OBSOLETE_IDE
974 969
975config CPU_LITTLE_ENDIAN 970config CPU_LITTLE_ENDIAN
976 bool "Generate little endian code" 971 bool "Generate little endian code"
977 default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA 972 default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
978 default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927 973 default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
979 help 974 help
980 Some MIPS machines can be configured for either little or big endian 975 Some MIPS machines can be configured for either little or big endian
@@ -1091,11 +1086,6 @@ config ARC32
1091config HAVE_STD_PC_SERIAL_PORT 1086config HAVE_STD_PC_SERIAL_PORT
1092 bool 1087 bool
1093 1088
1094config VR4181
1095 bool
1096 depends on NEC_OSPREY
1097 default y
1098
1099config ARC_CONSOLE 1089config ARC_CONSOLE
1100 bool "ARC console support" 1090 bool "ARC console support"
1101 depends on SGI_IP22 || SNI_RM200_PCI 1091 depends on SGI_IP22 || SNI_RM200_PCI
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 4bb849582314..7685f8baf3f0 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -229,15 +229,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
229 break; 229 break;
230 case PRID_IMP_VR41XX: 230 case PRID_IMP_VR41XX:
231 switch (c->processor_id & 0xf0) { 231 switch (c->processor_id & 0xf0) {
232#ifndef CONFIG_VR4181
233 case PRID_REV_VR4111: 232 case PRID_REV_VR4111:
234 c->cputype = CPU_VR4111; 233 c->cputype = CPU_VR4111;
235 break; 234 break;
236#else
237 case PRID_REV_VR4181:
238 c->cputype = CPU_VR4181;
239 break;
240#endif
241 case PRID_REV_VR4121: 235 case PRID_REV_VR4121:
242 c->cputype = CPU_VR4121; 236 c->cputype = CPU_VR4121;
243 break; 237 break;