summaryrefslogtreecommitdiffstats
path: root/arch/mips/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-19 01:28:40 +0000
commit8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch)
treeb88cc5a6cd513a04a512b7e6215c873c90a1c5dd /arch/mips/config.in
parentf01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff)
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r--arch/mips/config.in15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in
index c26394e33..1f70c46ad 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.43 2000/03/12 10:07:55 harald Exp $
+# $Id: config.in,v 1.44 2000/03/13 20:55:19 ralf Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
@@ -168,6 +168,19 @@ fi
source drivers/telephony/Config.in
mainmenu_option next_comment
+comment 'ATA/IDE/MFM/RLL support'
+
+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+
+if [ "$CONFIG_IDE" != "n" ]; then
+ source drivers/ide/Config.in
+else
+ define_bool CONFIG_BLK_DEV_IDE_MODES n
+ define_bool CONFIG_BLK_DEV_HD n
+fi
+endmenu
+
+mainmenu_option next_comment
comment 'SCSI support'
tristate 'SCSI support' CONFIG_SCSI