[PATCH] NinjaSCSI-32Bi/UDE PCI/Cardbus SCSI driver incidentals

Config files, makefiles etc for the NinjaSCSI driver.

diff --git a/CREDITS b/CREDITS
index 227adee1bfca7614f51dff1b0aca43c9bc09f893..a90322496cb08aa5f203e2266fe1c682e9913fd9 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1081,6 +1081,11 @@ D: Made support for modules, ramdisk, generic-serial, etc. optional.
 D: Transformed old user space bdflush into 1st kernel thread - kflushd.
 D: Many other patches, documentation files, mini kernels, utilities, ...
 
+N: Masanori GOTO
+E: gotom@debian.or.jp
+D: Workbit NinjaSCSI-32Bi/UDE driver
+S: Japan
+
 N: John E. Gotts
 E: jgotts@linuxsavvy.com
 D: kernel hacker
@@ -3338,6 +3343,12 @@ S: POB 1822
 S: Socorro NM, 87801
 S: USA
 
+N: Hiroshi YOKOTA
+E: yokota@netlab.is.tsukuba.ac.jp
+D: Workbit NinjaSCSI-3/32Bi PCMCIA driver
+D: Workbit NinjaSCSI-32Bi/UDE driver
+S: Japan
+
 N: Eric Youngdale
 E: eric@andante.org
 W: http://www.andante.org

diff --git a/MAINTAINERS b/MAINTAINERS
index db808a97de6fcdae381223c090083177aabb5cee..8c1746c95b973d36ff97f2cd462f1104f865470d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1166,6 +1166,14 @@ M:       yokota@netlab.is.tsukuba.ac.jp
 W:     http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:     Maintained
 
+NINJA SCSI-32Bi/UDE PCI/CARDBUS SCSI HOST ADAPTER DRIVER
+P:     GOTO Masanori
+M:     gotom@debian.or.jp
+P:     YOKOTA Hiroshi
+M:     yokota@netlab.is.tsukuba.ac.jp
+W:     http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
+S:     Maintained
+
 NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
 P:     Eberhard Moenkeberg
 M:     emoenke@gwdg.de

diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index 3290c4213660857deafb0af9bf93f9395979eacd..0ef1d5f33e354973c79a0b9b91c9d3bd3da45f60 100644 (file)
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -2617,6 +2617,7 @@
 10fc  I-O Data Device, Inc.
 # What's in the cardbus end of a Sony ACR-A01 card, comes with newer Vaio CD-RW drives
        0003  Cardbus IDE Controller
+       0005  Cardbus SCSI CBSC II
 10fd  Soyo Computer, Inc
 10fe  Fast Multimedia AG
 10ff  NCube
@@ -3027,6 +3028,12 @@
 1144  Cincinnati Milacron
        0001  Noservo controller
 1145  Workbit Corporation
+       f007  NinjaSCSI-32 KME
+       8007  NinjaSCSI-32 Workbit
+       f010  NinjaSCSI-32 Workbit
+       f012  NinjaSCSI-32 Logitec
+       f013  NinjaSCSI-32 Logitec
+       f015  NinjaSCSI-32 Melco
 1146  Force Computers
 1147  Interface Corp
 1148  Syskonnect (Schneider & Koch)

diff --git a/drivers/scsi/Config.help b/drivers/scsi/Config.help
index ed68406474d9bbe3307eca4a93cb4a64469ba57c..972b997683c8b4c25e994d87632c20a615a4631a 100644 (file)
--- a/drivers/scsi/Config.help
+++ b/drivers/scsi/Config.help
@@ -788,6 +788,16 @@ CONFIG_SCSI_NCR53C8XX_PQS_PDS
 
   The common answer here is N, but answering Y is safe.
 
+CONFIG_SCSI_NSP32
+  This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
+  SCSI host adapter. Please read the SCSI-HOWTO, available from
+  <http://www.linuxdoc.org/docs.html#howto>.
+
+  If you want to compile this 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 nsp32.o.
+
 CONFIG_SCSI_IBMMCA
   This is support for the IBM SCSI adapter found in many of the PS/2
   series computers.  These machines have an MCA bus, so you need to

diff --git a/drivers/scsi/Config.in b/drivers/scsi/Config.in
index e05d2905eece2913e69b1ff4012188aec5c6684b..0d96c68c4c651bc63b030a15c4935f0371adecdc 100644 (file)
--- a/drivers/scsi/Config.in
+++ b/drivers/scsi/Config.in
@@ -213,6 +213,7 @@ fi
 if [ "$CONFIG_X86" = "y" -a "$CONFIG_ISA" = "y" ]; then
    dep_tristate 'UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR $CONFIG_SCSI
 fi
+dep_tristate 'Workbit NinjaSCSI-32Bi/UDE support' CONFIG_SCSI_NSP32 $CONFIG_SCSI
 #
 # Note - this is a very special 'host' adapter that simulates the presence of some disks.
 # It can come in very handy for troubleshooting.  Anyone else is welcome to use it - all

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index f6cd4f29ce2d9b884185e797e41260571c2b8d94..c025acfb85d5a37f9b2b807397a22c3227656f0e 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -111,6 +111,7 @@ obj-$(CONFIG_SCSI_DEBUG)    += scsi_debug.o
 obj-$(CONFIG_SCSI_FCAL)                += fcal.o
 obj-$(CONFIG_SCSI_CPQFCTS)     += cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)     += lasi700.o 53c700.o
+obj-$(CONFIG_SCSI_NSP32)       += nsp32.o
 
 obj-$(CONFIG_ARCH_ACORN)       += ../acorn/scsi/