aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-06-10 16:35:28 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-15 11:09:31 -0400
commitbabdb788f7ec1a782a52240a5f6dae568f32565f (patch)
treea1c4cdc0618b9568c6a2dff798beaa1dcd2277e0
parent0454c7408ac533a0690cb308554a4ed304270c3d (diff)
[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>
-rw-r--r--drivers/net/Kconfig5
-rw-r--r--drivers/scsi/bnx2i/Kconfig1
2 files changed, 4 insertions, 2 deletions
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
2266 2266
2267config CNIC 2267config CNIC
2268 tristate "Broadcom CNIC support" 2268 tristate "Broadcom CNIC support"
2269 depends on BNX2 2269 depends on PCI
2270 depends on UIO 2270 select BNX2
2271 select UIO
2271 help 2272 help
2272 This driver supports offload features of Broadcom NetXtremeII 2273 This driver supports offload features of Broadcom NetXtremeII
2273 gigabit Ethernet cards. 2274 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
2 tristate "Broadcom NetXtreme II iSCSI support" 2 tristate "Broadcom NetXtreme II iSCSI support"
3 select SCSI_ISCSI_ATTRS 3 select SCSI_ISCSI_ATTRS
4 select CNIC 4 select CNIC
5 depends on PCI
5 ---help--- 6 ---help---
6 This driver supports iSCSI offload for the Broadcom NetXtreme II 7 This driver supports iSCSI offload for the Broadcom NetXtreme II
7 devices. 8 devices.