diff -Nuar vanilla-2.4.20-pre10/CREDITS linux-2.4.20-pre10/CREDITS --- vanilla-2.4.20-pre10/CREDITS 2002-10-09 11:23:13.000000000 +0900 +++ linux-2.4.20-pre10/CREDITS 2002-10-07 18:34:23.000000000 +0900 @@ -1065,6 +1065,11 @@ 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 @@ -3282,6 +3287,12 @@ 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 -Nuar vanilla-2.4.20-pre10/Documentation/Configure.help linux-2.4.20-pre10/Documentation/Configure.help --- vanilla-2.4.20-pre10/Documentation/Configure.help 2002-10-09 11:23:23.000000000 +0900 +++ linux-2.4.20-pre10/Documentation/Configure.help 2002-10-09 11:25:32.000000000 +0900 @@ -7907,6 +7907,17 @@ The common answer here is N, but answering Y is safe. +Workbit NinjaSCSI-32Bi/UDE support +CONFIG_SCSI_NSP32 + This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus + SCSI host adapter. Please read the SCSI-HOWTO, available from + . + + 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 . The module + will be called nsp32.o. + IBMMCA SCSI support CONFIG_SCSI_IBMMCA This is support for the IBM SCSI adapter found in many of the PS/2 diff -Nuar vanilla-2.4.20-pre10/MAINTAINERS linux-2.4.20-pre10/MAINTAINERS --- vanilla-2.4.20-pre10/MAINTAINERS 2002-10-09 11:23:16.000000000 +0900 +++ linux-2.4.20-pre10/MAINTAINERS 2002-10-07 18:33:44.000000000 +0900 @@ -1145,6 +1145,14 @@ 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 -Nuar vanilla-2.4.20-pre10/drivers/pci/pci.ids linux-2.4.20-pre10/drivers/pci/pci.ids --- vanilla-2.4.20-pre10/drivers/pci/pci.ids 2002-10-09 11:23:37.000000000 +0900 +++ linux-2.4.20-pre10/drivers/pci/pci.ids 2002-10-07 18:32:39.000000000 +0900 @@ -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 -Nuar vanilla-2.4.20-pre10/drivers/scsi/Config.in linux-2.4.20-pre10/drivers/scsi/Config.in --- vanilla-2.4.20-pre10/drivers/scsi/Config.in 2002-10-09 11:23:46.000000000 +0900 +++ linux-2.4.20-pre10/drivers/scsi/Config.in 2002-10-07 18:28:00.000000000 +0900 @@ -204,6 +204,7 @@ if [ "$CONFIG_X86" = "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 -Nuar vanilla-2.4.20-pre10/drivers/scsi/Makefile linux-2.4.20-pre10/drivers/scsi/Makefile --- vanilla-2.4.20-pre10/drivers/scsi/Makefile 2002-10-09 11:23:49.000000000 +0900 +++ linux-2.4.20-pre10/drivers/scsi/Makefile 2002-10-07 18:28:59.000000000 +0900 @@ -127,6 +127,7 @@ 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 subdir-$(CONFIG_ARCH_ACORN) += ../acorn/scsi obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/acorn-scsi.o