Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3e2bdb90813ced106e899decc3b2cd672b3df2d5..dfa93347c752479aeff9f4c307911add845a880e 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -263,6 +263,7 @@ config SCSI_SPI_ATTRS
 config SCSI_FC_ATTRS
        tristate "FiberChannel Transport Attributes"
        depends on SCSI && NET
+       select BLK_DEV_BSGLIB
        select SCSI_NETLINK
        help
          If you wish to export transport-specific information about
@@ -743,40 +744,18 @@ config SCSI_ISCI
          control unit found in the Intel(R) C600 series chipset.
 
 config SCSI_GENERIC_NCR5380
-       tristate "Generic NCR5380/53c400 SCSI PIO support"
-       depends on ISA && SCSI
+       tristate "Generic NCR5380/53c400 SCSI ISA card support"
+       depends on ISA && SCSI && HAS_IOPORT_MAP
        select SCSI_SPI_ATTRS
        ---help---
-         This is a driver for the old NCR 53c80 series of SCSI controllers
-         on boards using PIO. Most boards such as the Trantor T130 fit this
-         category, along with a large number of ISA 8bit controllers shipped
-         for free with SCSI scanners. If you have a PAS16, T128 or DMX3191
-         you should select the specific driver for that card rather than
-         generic 5380 support.
-
-         It is explained in section 3.8 of the SCSI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.  If it doesn't work out
-         of the box, you may have to change some settings in
-         <file:drivers/scsi/g_NCR5380.h>.
+         This is a driver for old ISA card SCSI controllers based on a
+         NCR 5380, 53C80, 53C400, 53C400A, or DTC 436 device.
+         Most boards such as the Trantor T130 fit this category, as do
+         various 8-bit and 16-bit ISA cards bundled with SCSI scanners.
 
          To compile this driver as a module, choose M here: the
          module will be called g_NCR5380.
 
-config SCSI_GENERIC_NCR5380_MMIO
-       tristate "Generic NCR5380/53c400 SCSI MMIO support"
-       depends on ISA && SCSI
-       select SCSI_SPI_ATTRS
-       ---help---
-         This is a driver for the old NCR 53c80 series of SCSI controllers
-         on boards using memory mapped I/O. 
-         It is explained in section 3.8 of the SCSI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.  If it doesn't work out
-         of the box, you may have to change some settings in
-         <file:drivers/scsi/g_NCR5380.h>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called g_NCR5380_mmio.
-
 config SCSI_IPS
        tristate "IBM ServeRAID support"
        depends on PCI && SCSI