summary refs log tree commit diff
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-30 09:44:29 -0600
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-30 13:09:44 -0600
commitfb5edd020fa0fbe991f4a473611ad530d2237425 (patch)
tree826bf5a41a6691b1bed7711cf2e36ecd8d750d14
parent58daa68a8fd4a373092df9035fdccaa29420f1e6 (diff)
downloadlinux-fb5edd020fa0fbe991f4a473611ad530d2237425.tar.gz
[SCSI] fcoe: fix configuration problems
fcoe selects libfc and requires SCSI and PCI (the SCSI requirement is
implicitly covered by an enclosing if).  Fix them both up so they
cannot be configured in an invalid state: make LIBFC select
SCSI_FC_ATTRS and make FCOE depend on PCI and select LIBFC.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 0e5e084dfb4c..152d4aa9354f 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -607,13 +607,13 @@ config SCSI_FLASHPOINT
 
 config LIBFC
 	tristate "LibFC module"
-	depends on SCSI && SCSI_FC_ATTRS
+	select SCSI_FC_ATTRS
 	---help---
 	  Fibre Channel library module
 
 config FCOE
 	tristate "FCoE module"
-	depends on SCSI
+	depends on PCI
 	select LIBFC
 	---help---
 	  Fibre Channel over Ethernet module