aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-06-10 13:35:28 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-15 10:09:31 -0500
commitbabdb788f7ec1a782a52240a5f6dae568f32565f (patch)
treea1c4cdc0618b9568c6a2dff798beaa1dcd2277e0 /drivers
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>
Diffstat (limited to 'drivers')
-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 f3c4a3b910b..f6903140dd9 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 820d428ae83..b62b482e55e 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.