driver-core: fix devtmpfs crash on s390

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1895259..9191d1e 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -388,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
@@ -399,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
@@ -652,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.