Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit aab7a8fd authored Aug 02, 2010 by Mike Christie Committed by James Bottomley Aug 06, 2010

[SCSI] iscsi boot: mv iscsi_boot_sysfs to drivers/scsi



iscsi_boot_sysfs does not depend on firmware. Any iscsi driver
can use it. This patch moves iscsi_boot_sysfs to the scsi
dir, so that it can be used on any arch with any driver.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Acked-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent 787f0bd3

drivers/firmware/Kconfig

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -122,14 +122,6 @@ config ISCSI_IBFT_FIND
	is necessary for iSCSI Boot Firmware Table Attributes module to work		is necessary for iSCSI Boot Firmware Table Attributes module to work
	properly.		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		config ISCSI_IBFT
	tristate "iSCSI Boot Firmware Table Attributes module"		tristate "iSCSI Boot Firmware Table Attributes module"
	select ISCSI_BOOT_SYSFS		select ISCSI_BOOT_SYSFS

drivers/firmware/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,5 +10,4 @@ obj-$(CONFIG_DCDBAS) += dcdbas.o
	obj-$(CONFIG_DMIID) += dmi-id.o		obj-$(CONFIG_DMIID) += dmi-id.o
	obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o		obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
	obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o		obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
	obj-$(CONFIG_ISCSI_BOOT_SYSFS) += iscsi_boot_sysfs.o
	obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o		obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o

drivers/scsi/Kconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -370,6 +370,14 @@ config ISCSI_TCP

	http://open-iscsi.org		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/cxgb3i/Kconfig"
	source "drivers/scsi/bnx2i/Kconfig"		source "drivers/scsi/bnx2i/Kconfig"
	source "drivers/scsi/be2iscsi/Kconfig"		source "drivers/scsi/be2iscsi/Kconfig"

drivers/scsi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ obj-$(CONFIG_FCOE) += fcoe/
	obj-$(CONFIG_FCOE_FNIC) += fnic/		obj-$(CONFIG_FCOE_FNIC) += fnic/
	obj-$(CONFIG_ISCSI_TCP) += libiscsi.o libiscsi_tcp.o iscsi_tcp.o		obj-$(CONFIG_ISCSI_TCP) += libiscsi.o libiscsi_tcp.o iscsi_tcp.o
	obj-$(CONFIG_INFINIBAND_ISER) += libiscsi.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_A4000T) += 53c700.o a4000t.o
	obj-$(CONFIG_SCSI_ZORRO7XX) += 53c700.o zorro7xx.o		obj-$(CONFIG_SCSI_ZORRO7XX) += 53c700.o zorro7xx.o
	obj-$(CONFIG_A3000_SCSI) += a3000.o wd33c93.o		obj-$(CONFIG_A3000_SCSI) += a3000.o wd33c93.o

drivers/firmware/iscsi_boot_sysfs.c→drivers/scsi/iscsi_boot_sysfs.c

+0 −0

File moved.