[SCSI] move iscsi to a better place in Kconfig

Now it looks like we'll have multiple users of the iscsi transport
class, the iscsi initiator shouldn't really be a dependency of it.  This
patch moves iscsi to being an initiator in its own right which selects
the transport attributes.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1c60c568e911..c76a3b8b5569 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -235,12 +235,18 @@ config SCSI_ISCSI_ATTRS
           each attached iSCSI device to sysfs, say Y.
           Otherwise, say N.
 
+endmenu
+
+menu "SCSI low-level drivers"
+        depends on SCSI!=n
+
 config ISCSI_TCP
         tristate "iSCSI Initiator over TCP/IP"
-        depends on SCSI && INET && SCSI_ISCSI_ATTRS
+        depends on SCSI && INET
         select CRYPTO
         select CRYPTO_MD5
         select CRYPTO_CRC32C
+        select SCSI_ISCSI_ATTRS
         help
          The iSCSI Driver provides a host with the ability to access storage
          through an IP network. The driver uses the iSCSI protocol to transport
@@ -258,11 +264,6 @@ config ISCSI_TCP
 
          http://linux-iscsi.sf.net
 
-endmenu
-
-menu "SCSI low-level drivers"
-        depends on SCSI!=n
-
 config SGIWD93_SCSI
         tristate "SGI WD93C93 SCSI Driver"
         depends on SGI_IP22 && SCSI