From fc0d141fee0a8924273da1438c3f7bcc66e87675 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Mon, 2 Aug 2010 12:46:12 -0500
Subject: [PATCH] --- yaml --- r: 209393 b: refs/heads/master c:
 aab7a8fd19d0c2f7fcac4d07616899655e326dfe h: refs/heads/master i:   209391:
 d99e2a0a2b01eb48dcb52701121cf94d8690ae4f v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/firmware/Kconfig                      | 8 --------
 trunk/drivers/firmware/Makefile                     | 1 -
 trunk/drivers/scsi/Kconfig                          | 8 ++++++++
 trunk/drivers/scsi/Makefile                         | 1 +
 trunk/drivers/{firmware => scsi}/iscsi_boot_sysfs.c | 0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename trunk/drivers/{firmware => scsi}/iscsi_boot_sysfs.c (100%)

diff --git a/[refs] b/[refs]
index a633c7f69b2b..555a596c3d2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 787f0bd3376aedb3f9ba9bbf862d85e4b176f9b0
+refs/heads/master: aab7a8fd19d0c2f7fcac4d07616899655e326dfe
diff --git a/trunk/drivers/firmware/Kconfig b/trunk/drivers/firmware/Kconfig
index a6c670b8ce52..f7cff381a4b8 100644
--- a/trunk/drivers/firmware/Kconfig
+++ b/trunk/drivers/firmware/Kconfig
@@ -122,14 +122,6 @@ config ISCSI_IBFT_FIND
 	  is necessary for iSCSI Boot Firmware Table Attributes module to work
 	  properly.
 
-config ISCSI_BOOT_SYSFS
-	tristate "iSCSI Boot Sysfs Interface"
-	default	n
-	help
-	  This option enables support for exposing iSCSI boot information
-	  via sysfs to userspace. If you wish to export this information,
-	  say Y. Otherwise, say N.
-
 config ISCSI_IBFT
 	tristate "iSCSI Boot Firmware Table Attributes module"
 	select ISCSI_BOOT_SYSFS
diff --git a/trunk/drivers/firmware/Makefile b/trunk/drivers/firmware/Makefile
index 5fe7e1662922..1c3c17343dbe 100644
--- a/trunk/drivers/firmware/Makefile
+++ b/trunk/drivers/firmware/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_DCDBAS)		+= dcdbas.o
 obj-$(CONFIG_DMIID)		+= dmi-id.o
 obj-$(CONFIG_ISCSI_IBFT_FIND)	+= iscsi_ibft_find.o
 obj-$(CONFIG_ISCSI_IBFT)	+= iscsi_ibft.o
-obj-$(CONFIG_ISCSI_BOOT_SYSFS)	+= iscsi_boot_sysfs.o
 obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index 158284f05732..a479b3b7ea90 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -370,6 +370,14 @@ config ISCSI_TCP
 
 	 http://open-iscsi.org
 
+config ISCSI_BOOT_SYSFS
+	tristate "iSCSI Boot Sysfs Interface"
+	default	n
+	help
+	  This option enables support for exposing iSCSI boot information
+	  via sysfs to userspace. If you wish to export this information,
+	  say Y. Otherwise, say N.
+
 source "drivers/scsi/cxgb3i/Kconfig"
 source "drivers/scsi/bnx2i/Kconfig"
 source "drivers/scsi/be2iscsi/Kconfig"
diff --git a/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile
index 2a3fca2eca6a..2703c6ec5e36 100644
--- a/trunk/drivers/scsi/Makefile
+++ b/trunk/drivers/scsi/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_FCOE)		+= fcoe/
 obj-$(CONFIG_FCOE_FNIC)		+= fnic/
 obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	libiscsi_tcp.o iscsi_tcp.o
 obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o
+obj-$(CONFIG_ISCSI_BOOT_SYSFS)	+= iscsi_boot_sysfs.o
 obj-$(CONFIG_SCSI_A4000T)	+= 53c700.o	a4000t.o
 obj-$(CONFIG_SCSI_ZORRO7XX)	+= 53c700.o	zorro7xx.o
 obj-$(CONFIG_A3000_SCSI)	+= a3000.o	wd33c93.o
diff --git a/trunk/drivers/firmware/iscsi_boot_sysfs.c b/trunk/drivers/scsi/iscsi_boot_sysfs.c
similarity index 100%
rename from trunk/drivers/firmware/iscsi_boot_sysfs.c
rename to trunk/drivers/scsi/iscsi_boot_sysfs.c