V4L/DVB: saa7127: support new vbi ops to set/get VBI format

[safe/jmp/linux-2.6] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 6a19ed9..75f2336 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1,9 +1,15 @@
 menu "SCSI device support"
 
+config SCSI_MOD
+       tristate
+       default y if SCSI=n || SCSI=y
+       default m if SCSI=m
+
 config RAID_ATTRS
        tristate "RAID Transport Class"
        default n
        depends on BLOCK
+       depends on SCSI_MOD
        ---help---
          Provides RAID
 
@@ -258,10 +264,21 @@ config SCSI_SCAN_ASYNC
          or async on the kernel's command line.
 
 config SCSI_WAIT_SCAN
-       tristate
+       tristate  # No prompt here, this is an invisible symbol.
        default m
        depends on SCSI
        depends on MODULES
+# scsi_wait_scan is a loadable module which waits until all the async scans are
+# complete.  The idea is to use it in initrd/ initramfs scripts.  You modprobe
+# it after all the modprobes of the root SCSI drivers and it will wait until
+# they have all finished scanning their buses before allowing the boot to
+# proceed.  (This method is not applicable if targets boot independently in
+# parallel with the initiator, or with transports with non-deterministic target
+# discovery schemes, or if a transport driver does not support scsi_wait_scan.)
+#
+# This symbol is not exposed as a prompt because little is to be gained by
+# disabling it, whereas people who accidentally switch it off may wonder why
+# their mkinitrd gets into trouble.
 
 menu "SCSI Transports"
        depends on SCSI
@@ -355,6 +372,7 @@ config ISCSI_TCP
 
 source "drivers/scsi/cxgb3i/Kconfig"
 source "drivers/scsi/bnx2i/Kconfig"
+source "drivers/scsi/be2iscsi/Kconfig"
 
 config SGIWD93_SCSI
        tristate "SGI WD93C93 SCSI Driver"
@@ -376,6 +394,16 @@ config BLK_DEV_3W_XXXX_RAID
          Please read the comments at the top of
          <file:drivers/scsi/3w-xxxx.c>.
 
+config SCSI_HPSA
+       tristate "HP Smart Array SCSI driver"
+       depends on PCI && SCSI
+       help
+         This driver supports HP Smart Array Controllers (circa 2009).
+         It is a SCSI alternative to the cciss driver, which is a block
+         driver.  Anyone wishing to use HP Smart Array controllers who
+         would prefer the devices be presented to linux as SCSI devices,
+         rather than as generic block devices should say Y here.
+
 config SCSI_3W_9XXX
        tristate "3ware 9xxx SATA-RAID support"
        depends on PCI && SCSI
@@ -387,6 +415,17 @@ config SCSI_3W_9XXX
          Please read the comments at the top of
          <file:drivers/scsi/3w-9xxx.c>.
 
+config SCSI_3W_SAS
+       tristate "3ware 97xx SAS/SATA-RAID support"
+       depends on PCI && SCSI
+       help
+         This driver supports the LSI 3ware 9750 6Gb/s SAS/SATA-RAID cards.
+
+         <http://www.lsi.com>
+
+         Please read the comments at the top of
+         <file:drivers/scsi/3w-sas.c>.
+
 config SCSI_7000FASST
        tristate "7000FASST SCSI support"
        depends on ISA && SCSI && ISA_DMA_API
@@ -609,6 +648,14 @@ config SCSI_FLASHPOINT
          substantial, so users of MultiMaster Host Adapters may not
          wish to include it.
 
+config VMWARE_PVSCSI
+       tristate "VMware PVSCSI driver support"
+       depends on PCI && SCSI && X86
+       help
+         This driver supports VMware's para virtualized SCSI HBA.
+         To compile this driver as a module, choose M here: the
+         module will be called vmw_pvscsi.
+
 config LIBFC
        tristate "LibFC module"
        select SCSI_FC_ATTRS
@@ -632,7 +679,7 @@ config FCOE
 config FCOE_FNIC
        tristate "Cisco FNIC Driver"
        depends on PCI && X86
-       select LIBFC
+       select LIBFCOE
        help
          This is support for the Cisco PCI-Express FCoE HBA.
 
@@ -1800,6 +1847,20 @@ config ZFCP
           called zfcp. If you want to compile it as a module, say M here
           and read <file:Documentation/kbuild/modules.txt>.
 
+config SCSI_PMCRAID
+       tristate "PMC SIERRA Linux MaxRAID adapter support"
+       depends on PCI && SCSI
+       ---help---
+         This driver supports the PMC SIERRA MaxRAID adapters.
+
+config SCSI_PM8001
+       tristate "PMC-Sierra SPC 8001 SAS/SATA Based Host Adapter driver"
+       depends on PCI && SCSI
+       select SCSI_SAS_LIBSAS
+       help
+         This driver supports PMC-Sierra PCIE SAS/SATA 8x6G SPC 8001 chip
+         based host adapters.
+
 config SCSI_SRP
        tristate "SCSI RDMA Protocol helper library"
        depends on SCSI && PCI
@@ -1810,6 +1871,16 @@ config SCSI_SRP
          To compile this driver as a module, choose M here: the
          module will be called libsrp.
 
+config SCSI_BFA_FC
+       tristate "Brocade BFA Fibre Channel Support"
+       depends on PCI && SCSI
+       select SCSI_FC_ATTRS
+       help
+         This bfa driver supports all Brocade PCIe FC/FCOE host adapters.
+
+         To compile this driver as a module, choose M here. The module will
+         be called bfa.
+
 endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"