From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2011 02:32:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'scsi/master'
X-Git-Tag: next-20110927~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6907a907bcc0b12f16927150f09805f34766209;p=karo-tx-linux.git

Merge remote-tracking branch 'scsi/master'
---

b6907a907bcc0b12f16927150f09805f34766209
diff --cc drivers/scsi/qla4xxx/Kconfig
index 0f5599e0abf6,5b1aed4f0754..f1ad02ea212b
--- a/drivers/scsi/qla4xxx/Kconfig
+++ b/drivers/scsi/qla4xxx/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
  config SCSI_QLA_ISCSI
  	tristate "QLogic ISP4XXX and ISP82XX host adapter family support"
 -	depends on PCI && SCSI
 +	depends on PCI && SCSI && NET
  	select SCSI_ISCSI_ATTRS
+ 	select ISCSI_BOOT_SYSFS
  	---help---
  	This driver supports the QLogic 40xx (ISP4XXX) and 8022 (ISP82XX)
  	iSCSI host adapter family.