summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-04 10:29:52 -0700
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 09:05:38 -0500
commit82c57028e4bf6e2755de91b36223f57406746fa8 (patch)
tree84da758923e51046e337854254bf5224aaa2fa10 /drivers/scsi
parentb38c1e8bd19340e1a5b712287a8d61da26225d5b (diff)
downloadblackbird-op-linux-82c57028e4bf6e2755de91b36223f57406746fa8.tar.gz
blackbird-op-linux-82c57028e4bf6e2755de91b36223f57406746fa8.zip
[SCSI] scsi: add Kconfig dependency on NET
be2iscsi driver should #include linux/if_ether.h since it uses sysfs_format_mac(). It should also depend on NET since it selects SCSI_ISCSI_ATTRS, which depends on NET. These changes fix a build error when CONFIG_NET is not enabled: ERROR: "sysfs_format_mac" [drivers/scsi/be2iscsi/be2iscsi.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Jayamohan Kallickal <jayamohank@serverengines.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/be2iscsi/Kconfig2
-rw-r--r--drivers/scsi/be2iscsi/be_main.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/Kconfig b/drivers/scsi/be2iscsi/Kconfig
index 2952fcd008ea..84c275fb9f6b 100644
--- a/drivers/scsi/be2iscsi/Kconfig
+++ b/drivers/scsi/be2iscsi/Kconfig
@@ -1,6 +1,6 @@
config BE2ISCSI
tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"
- depends on PCI && SCSI
+ depends on PCI && SCSI && NET
select SCSI_ISCSI_ATTRS
help
diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 08996d008ba6..c643bb3736fc 100644
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -23,6 +23,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
+#include <linux/if_ether.h>
#include <linux/in.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
OpenPOWER on IntegriCloud