netfilter: nf_conntrack: elegantly simplify nf_ct_exp_net()

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 82bb3b2..9191d1e 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -366,6 +366,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"
@@ -387,6 +388,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
@@ -398,6 +409,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
@@ -620,6 +642,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
@@ -643,7 +673,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.
 
@@ -1817,6 +1847,14 @@ config SCSI_PMCRAID
        ---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
@@ -1827,6 +1865,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"