summaryrefslogtreecommitdiffstats
path: root/arch/mips/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-01 02:54:21 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-01 02:54:21 +0000
commit1eb1d8f4cf7668cf937ad74824c985b88aa62cf3 (patch)
treea058dba9a0943c3294ce7cefe116f715caf8c964 /arch/mips/config.in
parent5f858d94183211ab76f7f1a1e372433c6b8d5e36 (diff)
Eleminate CONFIG_CPU_R3912; detect TX39 / R3000 at runtime.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r--arch/mips/config.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index bffbad944..1c8b34e0f 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -160,6 +160,9 @@ fi
if [ "$CONFIG_MIPS_IVR" = "y" ]; then
define_bool CONFIG_PCI y
fi
+if [ "$CONFIG_NINO" = "y" ]; then
+ define_bool CONFIG_PC_KEYB y
+fi
if [ "$CONFIG_ISA" != "y" ]; then
define_bool CONFIG_ISA n
@@ -191,7 +194,6 @@ comment 'CPU selection'
choice 'CPU type' \
"R3000 CONFIG_CPU_R3000 \
- R3912 CONFIG_CPU_R3912 \
R6000 CONFIG_CPU_R6000 \
R4300 CONFIG_CPU_R4300 \
R4x00 CONFIG_CPU_R4X00 \
@@ -218,13 +220,8 @@ else
define_bool CONFIG_CPU_HAS_WB n
fi
else
- if [ "$CONFIG_CPU_R3912" = "y" ]; then
- define_bool CONFIG_CPU_HAS_LLSC n
- define_bool CONFIG_CPU_HAS_WB n
- else
define_bool CONFIG_CPU_HAS_LLSC y
define_bool CONFIG_CPU_HAS_WB n
- fi
fi
fi
endmenu