From: Michael Chan <mchan@broadcom.com>
Date: Wed, 10 Jun 2009 20:35:28 +0000 (-0700)
Subject: [SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=babdb788f7ec1a782a52240a5f6dae568f32565f;p=linux-beck.git

[SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.

CNIC and BNX2I must depend on PCI.  Dependencies do not get
propagated through select.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f3c4a3b910bb..f6903140dd91 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2266,8 +2266,9 @@ config BNX2
 
 config CNIC
 	tristate "Broadcom CNIC support"
-	depends on BNX2
-	depends on UIO
+	depends on PCI
+	select BNX2
+	select UIO
 	help
 	  This driver supports offload features of Broadcom NetXtremeII
 	  gigabit Ethernet cards.
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 820d428ae839..b62b482e55e7 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
 	tristate "Broadcom NetXtreme II iSCSI support"
 	select SCSI_ISCSI_ATTRS
 	select CNIC
+	depends on PCI
 	---help---
 	This driver supports iSCSI offload for the Broadcom NetXtreme II
 	devices.