Patch MAINTAINERS file, add fnic module to scsi Makefile and Kconfig Signed-off-by: Abhijeet Joglekar <abjoglek@xxxxxxxxx> Signed-off-by: Joe Eykholt <jeykholt@xxxxxxxxx> Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx> --- MAINTAINERS | 8 ++++++++ drivers/scsi/Kconfig | 11 +++++++++++ drivers/scsi/Makefile | 1 + 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ebaf77e..405f574 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ P: Nils Faerber (port to kernel 2.4) M: Nils Faerber <nils@xxxxxxxxxxxxxxxxx> S: Maintained +CISCO FCOE HBA DRIVER +P: Abhijeet Joglekar +M: abjoglek@xxxxxxxxx +P: Joe Eykholt +M: jeykholt@xxxxxxxxx +L: linux-scsi@xxxxxxxxxxxxxxx +S: Supported + CODA FILE SYSTEM P: Jan Harkes M: jaharkes@xxxxxxxxxx diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 876cd20..d45f3ad 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 diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index e7c861a..a5049cf 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_SCSI_DH) += device_handler/ obj-$(CONFIG_LIBFC) += libfc/ obj-$(CONFIG_LIBFCOE) += fcoe/ obj-$(CONFIG_FCOE) += fcoe/ +obj-$(CONFIG_FCOE_FNIC) += fnic/ obj-$(CONFIG_ISCSI_TCP) += libiscsi.o libiscsi_tcp.o iscsi_tcp.o obj-$(CONFIG_INFINIBAND_ISER) += libiscsi.o obj-$(CONFIG_SCSI_A4000T) += 53c700.o a4000t.o -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
