patch-1.3.28 linux/arch/i386/config.in

Next file: linux/arch/i386/kernel/setup.c
Previous file: linux/arch/alpha/vmlinux.lds
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.27/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -78,7 +78,7 @@
 
 comment 'SCSI support'
 
-bool 'SCSI support' CONFIG_SCSI y
+tristate 'SCSI support' CONFIG_SCSI y
 
 if [ "$CONFIG_SCSI" = "n" ]; then
 
@@ -88,10 +88,10 @@
 
 comment 'SCSI support type (disk, tape, CDrom)'
 
-tristate 'SCSI disk support' CONFIG_BLK_DEV_SD y
-tristate 'SCSI tape support' CONFIG_CHR_DEV_ST n
-tristate 'SCSI CDROM support' CONFIG_BLK_DEV_SR y
-tristate 'SCSI generic support' CONFIG_CHR_DEV_SG n
+dep_tristate 'SCSI disk support' CONFIG_BLK_DEV_SD y $CONFIG_SCSI
+dep_tristate 'SCSI tape support' CONFIG_CHR_DEV_ST n $CONFIG_SCSI
+dep_tristate 'SCSI CDROM support' CONFIG_BLK_DEV_SR y $CONFIG_SCSI
+dep_tristate 'SCSI generic support' CONFIG_CHR_DEV_SG n $CONFIG_SCSI
 
 comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs'
 
@@ -99,28 +99,28 @@
 
 comment 'SCSI low-level drivers'
 
-tristate 'Adaptec AHA152X support' CONFIG_SCSI_AHA152X y
-tristate 'Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 n
-tristate 'Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 n
-tristate 'Adaptec AHA274X/284X/294X support' CONFIG_SCSI_AIC7XXX n
-tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC n
-tristate 'EATA-DMA (DPT, NEC, ATT, Olivetti) support' CONFIG_SCSI_EATA_DMA n
-tristate 'EATA-PIO (old DPT PM2001, PM2012A) support' CONFIG_SCSI_EATA_PIO n
-tristate 'UltraStor 14F/34F support' CONFIG_SCSI_U14_34F n
-tristate 'Future Domain 16xx SCSI support' CONFIG_SCSI_FUTURE_DOMAIN n
+dep_tristate 'Adaptec AHA152X support' CONFIG_SCSI_AHA152X y $CONFIG_SCSI
+dep_tristate 'Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 n $CONFIG_SCSI
+dep_tristate 'Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 n $CONFIG_SCSI
+dep_tristate 'Adaptec AHA274X/284X/294X support' CONFIG_SCSI_AIC7XXX n $CONFIG_SCSI
+dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC n $CONFIG_SCSI
+dep_tristate 'EATA-DMA (DPT, NEC, ATT, Olivetti) support' CONFIG_SCSI_EATA_DMA n $CONFIG_SCSI
+dep_tristate 'EATA-PIO (old DPT PM2001, PM2012A) support' CONFIG_SCSI_EATA_PIO n $CONFIG_SCSI
+dep_tristate 'UltraStor 14F/34F support' CONFIG_SCSI_U14_34F n $CONFIG_SCSI
+dep_tristate 'Future Domain 16xx SCSI support' CONFIG_SCSI_FUTURE_DOMAIN n $CONFIG_SCSI
 bool 'Generic NCR5380 SCSI support' CONFIG_SCSI_GENERIC_NCR5380 n
 if [ "$CONFIG_PCI" = "y" ]; then
-  tristate 'NCR53c7,8xx SCSI support'  CONFIG_SCSI_NCR53C7xx n
+  dep_tristate 'NCR53c7,8xx SCSI support'  CONFIG_SCSI_NCR53C7xx n $CONFIG_SCSI
 fi
-tristate 'Always IN2000 SCSI support (test release)' CONFIG_SCSI_IN2000 n
+dep_tristate 'Always IN2000 SCSI support (test release)' CONFIG_SCSI_IN2000 n $CONFIG_SCSI
 bool 'PAS16 SCSI support' CONFIG_SCSI_PAS16 n
-tristate 'QLOGIC SCSI support' CONFIG_SCSI_QLOGIC n
-tristate 'Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE n
+dep_tristate 'QLOGIC SCSI support' CONFIG_SCSI_QLOGIC n $CONFIG_SCSI
+dep_tristate 'Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE n $CONFIG_SCSI
 bool 'Trantor T128/T128F/T228 SCSI support' CONFIG_SCSI_T128 n
-tristate 'UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR n
-tristate '7000FASST SCSI support' CONFIG_SCSI_7000FASST n
-tristate 'EATA ISA/EISA (DPT PM2011/021/012/022/122/322) support' CONFIG_SCSI_EATA n
-#tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG n
+dep_tristate 'UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR n $CONFIG_SCSI
+dep_tristate '7000FASST SCSI support' CONFIG_SCSI_7000FASST n $CONFIG_SCSI
+dep_tristate 'EATA ISA/EISA (DPT PM2011/021/012/022/122/322) support' CONFIG_SCSI_EATA n $CONFIG_SCSI
+#dep_tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG n $CONFIG_SCSI
 fi
 
 
@@ -303,7 +303,7 @@
 
 comment 'Sound'
 
-bool 'Sound card support' CONFIG_SOUND n
+tristate 'Sound card support' CONFIG_SOUND n
 
 comment 'Kernel hacking'
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this