aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-08-10 21:01:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:01 -0400
commit5c90ad905b401c6675dcb6c9fed7c09c9240205c (patch)
treecb41e087faa85f2bb8604758a62d2481102c7f3c /drivers/scsi
parentb2045240058381088e6e367e5f54b2a8bed931e1 (diff)
scsi: fix bnx2i build errors
bnx2i should depend on NET since it selects SCSI_ISCSI_ATTRS, which depends on NET. Also move the dependencies together. The "depends" change fixes multiple build errors when CONFIG_NET is not enabled: ERROR: "skb_trim" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "netlink_kernel_create" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "netlink_kernel_release" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "skb_pull" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "init_net" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "__alloc_skb" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "netlink_broadcast" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "kfree_skb" [drivers/scsi/scsi_transport_iscsi.ko] undefined! ERROR: "skb_put" [drivers/scsi/scsi_transport_iscsi.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Anil Veerabhadrappa <anilgv@broadcom.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/bnx2i/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 1e9f7141102b..45a6154ce972 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -1,10 +1,11 @@
1config SCSI_BNX2_ISCSI 1config SCSI_BNX2_ISCSI
2 tristate "Broadcom NetXtreme II iSCSI support" 2 tristate "Broadcom NetXtreme II iSCSI support"
3 depends on NET
4 depends on PCI
3 select SCSI_ISCSI_ATTRS 5 select SCSI_ISCSI_ATTRS
4 select NETDEVICES 6 select NETDEVICES
5 select NETDEV_1000 7 select NETDEV_1000
6 select CNIC 8 select CNIC
7 depends on PCI
8 ---help--- 9 ---help---
9 This driver supports iSCSI offload for the Broadcom NetXtreme II 10 This driver supports iSCSI offload for the Broadcom NetXtreme II
10 devices. 11 devices.