Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...

1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 20297c521e50..8ed2990c826e 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -121,10 +121,11 @@ config BLK_DEV_SR
         tristate "SCSI CDROM support"
         depends on SCSI
         ---help---
-          If you want to use a SCSI or FireWire CD-ROM under Linux,
-          say Y and read the SCSI-HOWTO and the CDROM-HOWTO at
-          <http://www.tldp.org/docs.html#howto>. Also make sure to say
-          Y or M to "ISO 9660 CD-ROM file system support" later.
+          If you want to use a CD or DVD drive attached to your computer
+          by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO
+          and the CDROM-HOWTO at <http://www.tldp.org/docs.html#howto>.
+
+          Make sure to say Y or M to "ISO 9660 CD-ROM file system support".
 
           To compile this driver as a module, choose M here and read
           <file:Documentation/scsi/scsi.txt>.
@@ -614,10 +615,16 @@ config LIBFC
         ---help---
           Fibre Channel library module
 
+config LIBFCOE
+        tristate "LibFCoE module"
+        select LIBFC
+        ---help---
+          Library for Fibre Channel over Ethernet module
+
 config FCOE
         tristate "FCoE module"
         depends on PCI
-        select LIBFC
+        select LIBFCOE
         ---help---
           Fibre Channel over Ethernet module