Merge ../to-linus-stable/

[linux-2.6] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 27fec8a5eb5bff4642c28160fb4d0ad6941dcd15..f1e8c4223ed1d2f11d1ee3485875502cf9bf2629 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -137,6 +137,24 @@ config CHR_DEV_SG
 
          If unsure, say N.
 
+config CHR_DEV_SCH
+       tristate "SCSI media changer support"
+       depends on SCSI
+       ---help---
+         This is a driver for SCSI media changers.  Most common devices are
+         tape libraries and MOD/CDROM jukeboxes.  *Real* jukeboxes, you
+         don't need this for those tiny 6-slot cdrom changers.  Media
+         changers are listed as "Type: Medium Changer" in /proc/scsi/scsi.
+         If you have such hardware and want to use it with linux, say Y
+         here.  Check <file:Documentation/scsi-changer.txt> for details.
+       
+         If you want to compile this as a module ( = code which can be
+         inserted in and removed from the running kernel whenever you want),
+         say M here and read <file:Documentation/modules.txt> and
+         <file:Documentation/scsi.txt>. The module will be called ch.o.
+         If unsure, say N.
+       
+
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
        depends on SCSI
 
@@ -406,7 +424,7 @@ config SCSI_IN2000
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 
 config SCSI_SATA
-       bool "Serial ATA (SATA) support"
+       tristate "Serial ATA (SATA) support"
        depends on SCSI
        help
          This driver family supports Serial ATA host controllers
@@ -1192,28 +1210,6 @@ config SCSI_PAS16
          To compile this driver as a module, choose M here: the
          module will be called pas16.
 
-config SCSI_PCI2000
-       tristate "PCI2000 support"
-       depends on PCI && SCSI && BROKEN
-       help
-         This is support for the PCI2000I EIDE interface card which acts as a
-         SCSI host adapter.  Please read the SCSI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pci2000.
-
-config SCSI_PCI2220I
-       tristate "PCI2220i support"
-       depends on PCI && SCSI && BROKEN
-       help
-         This is support for the PCI2220i EIDE interface card which acts as a
-         SCSI host adapter.  Please read the SCSI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pci2220i.
-
 config SCSI_PSI240I
        tristate "PSI240i support"
        depends on ISA && SCSI