diff -Naurp scsi-misc-2.6.orig/drivers/scsi/iscsi-sfnet/Kconfig scsi-misc-2.6.test/drivers/scsi/iscsi-sfnet/Kconfig
--- scsi-misc-2.6.orig/drivers/scsi/iscsi-sfnet/Kconfig	1969-12-31 16:00:00.000000000 -0800
+++ scsi-misc-2.6.test/drivers/scsi/iscsi-sfnet/Kconfig	2005-01-05 01:15:07.712291051 -0800
@@ -0,0 +1,25 @@
+config SCSI_ISCSI_SFNET
+	tristate "Software iSCSI support"
+	depends on SCSI && INET
+	select SCSI_ISCSI_ATTRS
+	select CRYPTO
+	select CRYPTO_MD5
+	select CRYPTO_CRC32C
+	---help---
+	To compile this driver as a module, choose M here: the
+	module will be called iscsi_sfnet.
+
+	The iSCSI Driver provides a host with the ability to access
+	storage through an IP network. The driver uses the iSCSI
+	protocol to transport SCSI requests and responses over an IP
+	network between the host (the "initiator") and "targets".
+	Architecturally, the iSCSI driver combines with the host's
+	TCP/IP stack, network drivers, and Network Interface Card
+	(NIC) to provide the same functions as a SCSI or a Fibre
+	Channel (FC) adapter driver with a Host Bus Adapter (HBA).
+
+	The userspace component needed to initialize the driver,
+	documentation, and sample configuration files can be found
+	here:
+
+	http://linux-iscsi.sourceforge.net
diff -Naurp scsi-misc-2.6.orig/drivers/scsi/iscsi-sfnet/Makefile scsi-misc-2.6.test/drivers/scsi/iscsi-sfnet/Makefile
--- scsi-misc-2.6.orig/drivers/scsi/iscsi-sfnet/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ scsi-misc-2.6.test/drivers/scsi/iscsi-sfnet/Makefile	2005-01-05 01:15:18.661906339 -0800
@@ -0,0 +1,16 @@
+#
+# Makefile for Software iSCSI driver
+#
+obj-$(CONFIG_SCSI_ISCSI_SFNET)	+= 	iscsi_sfnet.o
+iscsi_sfnet-objs		:=	iscsi-initiator.o
+iscsi_sfnet-objs		+= 	iscsi-attr.o \
+					iscsi-session.o \
+					iscsi-task.o \
+					iscsi-portal.o \
+					iscsi-ioctl.o \
+					iscsi-network.o \
+					iscsi-recv-pdu.o \
+					iscsi-xmit-pdu.o \
+					iscsi-auth.o \
+					iscsi-login.o \
+					iscsi-auth-client.o
diff -Naurp scsi-misc-2.6.orig/drivers/scsi/Kconfig scsi-misc-2.6.test/drivers/scsi/Kconfig
--- scsi-misc-2.6.orig/drivers/scsi/Kconfig	2005-01-05 01:13:32.951273657 -0800
+++ scsi-misc-2.6.test/drivers/scsi/Kconfig	2005-01-05 01:14:37.771077311 -0800
@@ -854,6 +854,8 @@ config SCSI_PPA
 	  To compile this driver as a module, choose M here: the
 	  module will be called ppa.
 
+source "drivers/scsi/iscsi-sfnet/Kconfig"
+
 config SCSI_IMM
 	tristate "IOMEGA parallel port (imm - newer drives)"
 	depends on SCSI && PARPORT
diff -Naurp scsi-misc-2.6.orig/drivers/scsi/Makefile scsi-misc-2.6.test/drivers/scsi/Makefile
--- scsi-misc-2.6.orig/drivers/scsi/Makefile	2005-01-05 01:13:33.221239510 -0800
+++ scsi-misc-2.6.test/drivers/scsi/Makefile	2005-01-05 01:14:33.208654238 -0800
@@ -132,6 +132,7 @@ obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o 
 obj-$(CONFIG_SCSI_SATA_SX4)	+= libata.o sata_sx4.o
 obj-$(CONFIG_SCSI_SATA_NV)	+= libata.o sata_nv.o
 obj-$(CONFIG_SCSI_SATA_ULI)	+= libata.o sata_uli.o
+obj-$(CONFIG_SCSI_ISCSI_SFNET)	+= iscsi-sfnet/
 
 obj-$(CONFIG_ARM)		+= arm/