2.4 ibmvscsi

@@ -0,0 +1,18 @@
+# Makefile for the IBM Virtual SCSI driver.
+
+list-multi := ibmvscsic.o
+ifeq ($(CONFIG_PPC_ISERIES),y)
+  ibmvscsi-objs := ibmvscsi.o iseries_vscsi.o
+else
+  ibmvscsi-objs := ibmvscsi.o rpa_vscsi.o
+endif
+
+obj-$(CONFIG_SCSI_IBMVSCSI) := ibmvscsic.o
+
+ibmvscsic.o: $(ibmvscsi-objs)
+	$(LD) -r -o $@ $(ibmvscsi-objs)
+
+include $(TOPDIR)/Rules.make
+
+clean:
+	rm -f *.o

@@ -131,6 +131,11 @@
 obj-$(CONFIG_SCSI_LASI700)	+= lasi700.o 53c700.o
 obj-$(CONFIG_SCSI_NSP32)	+= nsp32.o
 
+subdir-$(CONFIG_SCSI_IBMVSCSI)	+= ibmvscsi
+ifeq ($(CONFIG_SCSI_IBMVSCSI),y)
+  obj-$(CONFIG_SCSI_IBMVSCSI)	+= ibmvscsi/ibmvscsic.o
+endif
+
 subdir-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi
 obj-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi/acorn-scsi.o
 

@@ -108,6 +108,9 @@
 if [ "$CONFIG_X86" = "y" ]; then
    dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI $CONFIG_PCI
 fi
+if [ "$CONFIG_PPC_PSERIES" = "y" -o "$CONFIG_PPC_ISERIES" = "y" ]; then
+   tristate 'IBM Virtual SCSI Client support' CONFIG_SCSI_IBMVSCSI
+fi
 dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI $CONFIG_PCI
 dep_tristate 'Initio INI-A100U2W support' CONFIG_SCSI_INIA100 $CONFIG_SCSI $CONFIG_PCI
 if [ "$CONFIG_PARPORT" != "n" ]; then

@@ -11909,6 +11909,16 @@
 CONFIG_MV64340_ETH_2
   Enable port 2 on the MV64340 Ethernet controller.
 
+IBM PowerPC Virtual SCSI
+CONFIG_SCSI_IBMVSCSI
+  This driver supports virtual SCSI adapters on newer IBM iSeries 
+  and pSeries systems.  
+
+  If you want to compile the driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt>.  The module
+  will be called ibmvscsic.o.
+
 MyriCOM Gigabit Ethernet support
 CONFIG_MYRI_SBUS
   This driver supports MyriCOM Sbus gigabit Ethernet cards.