[PATCH] Make CONFIG_ISA a choice for i386

[Andi Kleen]

Now that most driver dirs honour CONFIG_ISA it makes sense to offer it 
as a user visible choice for i386.  Most users of modern PCs will 
define this as off. Also disables the old style CDROM support when
ISA support is not defined.

-Andi

--- linux/arch/i386/config.in	Mon Jun 10 14:31:20 2002
+++ linux-2.5.22-work/arch/i386/config.in	Tue Jun 18 02:46:39 2002
@@ -5,7 +5,6 @@
 mainmenu_name "Linux Kernel Configuration"
 
 define_bool CONFIG_X86 y
-define_bool CONFIG_ISA y
 define_bool CONFIG_SBUS n
 
 define_bool CONFIG_UID16 y
@@ -259,7 +258,9 @@
 
 source drivers/pci/Config.in
 
-bool 'EISA support' CONFIG_EISA
+bool 'ISA support' CONFIG_ISA
+
+dep_bool 'EISA support' CONFIG_EISA $CONFIG_ISA
 
 if [ "$CONFIG_VISWS" != "y" ]; then
    bool 'MCA support' CONFIG_MCA
@@ -357,7 +358,10 @@
 
 source drivers/isdn/Config.in
 
+if [ "$CONFIG_ISA" != "n" ]; then
+
 mainmenu_option next_comment
+
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'
 
 bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
@@ -365,6 +369,8 @@
    source drivers/cdrom/Config.in
 fi
 endmenu
+
+fi
 
 #
 # input before char - char/joystick depends on it. As does USB.