From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Tue, 30 Dec 2008 15:44:29 +0000 (-0600)
Subject: [SCSI] fcoe: fix configuration problems
X-Git-Tag: v2.6.29-rc1~555^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fb5edd020fa0fbe991f4a473611ad530d2237425;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 0e5e084dfb4..152d4aa9354 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