Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 510bedb375757575cd689ce374429781e3f9ad84..7f78e3ea517d7e9afa272af07d017c8ae26758bf 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -179,7 +179,15 @@ config CHR_DEV_SCH
          say M here and read <file:Documentation/kbuild/modules.txt> and
          <file:Documentation/scsi/scsi.txt>. The module will be called ch.o.
          If unsure, say N.
          say M here and read <file:Documentation/kbuild/modules.txt> and
          <file:Documentation/scsi/scsi.txt>. The module will be called ch.o.
          If unsure, say N.

-       
+
+config SCSI_ENCLOSURE
+       tristate "SCSI Enclosure Support"
+       depends on SCSI && ENCLOSURE_SERVICES
+       help
+         Enclosures are devices sitting on or in SCSI backplanes that
+         manage devices.  If you have a disk cage, the chances are that
+         it has an enclosure device.  Selecting this option will just allow
+         certain enclosure conditions to be reported and is not required.

 
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
        depends on SCSI
 
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
        depends on SCSI


@@ -317,7 +325,7 @@ menuconfig SCSI_LOWLEVEL
        depends on SCSI!=n
        default y
 
        depends on SCSI!=n
        default y
 

-if SCSI_LOWLEVEL
+if SCSI_LOWLEVEL && SCSI

 
 config ISCSI_TCP
        tristate "iSCSI Initiator over TCP/IP"
 
 config ISCSI_TCP
        tristate "iSCSI Initiator over TCP/IP"


@@ -580,18 +588,20 @@ config SCSI_BUSLOGIC
          <http://www.tldp.org/docs.html#howto>, and the files
          <file:Documentation/scsi/BusLogic.txt> and
          <file:Documentation/scsi/FlashPoint.txt> for more information.
          <http://www.tldp.org/docs.html#howto>, and the files
          <file:Documentation/scsi/BusLogic.txt> and
          <file:Documentation/scsi/FlashPoint.txt> for more information.

+         Note that support for FlashPoint is only available for 32-bit
+         x86 configurations.

 
          To compile this driver as a module, choose M here: the
          module will be called BusLogic.
 
 
          To compile this driver as a module, choose M here: the
          module will be called BusLogic.
 

-config SCSI_OMIT_FLASHPOINT
-       bool "Omit FlashPoint support"
-       depends on SCSI_BUSLOGIC
+config SCSI_FLASHPOINT
+       bool "FlashPoint support"
+       depends on SCSI_BUSLOGIC && PCI && X86_32

        help
        help

-         This option allows you to omit the FlashPoint support from the
+         This option allows you to add FlashPoint support to the

          BusLogic SCSI driver. The FlashPoint SCCB Manager code is
          BusLogic SCSI driver. The FlashPoint SCCB Manager code is

-         substantial, so users of MultiMaster Host Adapters may wish to omit
-         it.
+         substantial, so users of MultiMaster Host Adapters may not
+         wish to include it.

 
 config SCSI_DMX3191D
        tristate "DMX3191D SCSI support"
 
 config SCSI_DMX3191D
        tristate "DMX3191D SCSI support"


@@ -714,7 +724,7 @@ config SCSI_FD_MCS
 
 config SCSI_GDTH
        tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
 
 config SCSI_GDTH
        tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"

-       depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API && PCI_LEGACY
+       depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API

        ---help---
          Formerly called GDT SCSI Disk Array Controller Support.
 
        ---help---
          Formerly called GDT SCSI Disk Array Controller Support.
 


@@ -984,6 +994,16 @@ config SCSI_IZIP_SLOW_CTR
 
          Generally, saying N is fine.
 
 
          Generally, saying N is fine.
 

+config SCSI_MVSAS
+       tristate "Marvell 88SE6440 SAS/SATA support"
+       depends on PCI && SCSI
+       select SCSI_SAS_LIBSAS
+       help
+         This driver supports Marvell SAS/SATA PCI devices.
+
+         To compiler this driver as a module, choose M here: the module
+         will be called mvsas.
+

 config SCSI_NCR53C406A
        tristate "NCR53c406a SCSI support"
        depends on ISA && SCSI
 config SCSI_NCR53C406A
        tristate "NCR53c406a SCSI support"
        depends on ISA && SCSI