diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 17:20:44 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 17:20:44 -0500 |
commit | 45d7c46d54dae008f66db58e6bd31d9b31833043 (patch) | |
tree | 0e85cf3a39eadc84d3fb2b49d8697ed3a100ba9c /drivers/scsi/Kconfig | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
parent | 2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f (diff) |
Merge branch 'scsi-fixes' into merge-base
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 8ed2990c826..fb2740789b6 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -628,6 +628,17 @@ config FCOE ---help--- Fibre Channel over Ethernet module +config FCOE_FNIC + tristate "Cisco FNIC Driver" + depends on PCI && X86 + select LIBFC + help + This is support for the Cisco PCI-Express FCoE HBA. + + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/scsi.txt>. + The module will be called fnic. + config SCSI_DMX3191D tristate "DMX3191D SCSI support" depends on PCI && SCSI |