summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoto Masanori <gotom@debian.or.jp>2002-10-06 02:36:34 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-10-06 02:36:34 -0700
commit258ee56ad55dd9c90fefe616411d25f143541f65 (patch)
tree8497fa28b72f6e4cde195334b5d9ee4212fcaa92
parent6430dce24ae124d8985965bb6a244d1eec64922e (diff)
[PATCH] NinjaSCSI-32Bi/UDE PCI/Cardbus SCSI driver incidentals
Config files, makefiles etc for the NinjaSCSI driver.
-rw-r--r--CREDITS11
-rw-r--r--MAINTAINERS8
-rw-r--r--drivers/pci/pci.ids7
-rw-r--r--drivers/scsi/Config.help10
-rw-r--r--drivers/scsi/Config.in1
-rw-r--r--drivers/scsi/Makefile1
6 files changed, 38 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 227adee1bfca..a90322496cb0 100644
--- 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 db808a97de6f..8c1746c95b97 100644
--- 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 3290c4213660..0ef1d5f33e35 100644
--- 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 ed68406474d9..972b997683c8 100644
--- 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 e05d2905eece..0d96c68c4c65 100644
--- 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 f6cd4f29ce2d..c025acfb85d5 100644
--- 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/