diff -uNr linux/MAINTAINERS linux-2.5.5-dj2-dc395/MAINTAINERS
--- linux/MAINTAINERS	Wed Feb 27 12:22:08 2002
+++ linux-2.5.5-dj2-dc395/MAINTAINERS	Thu Feb 28 06:03:55 2002
@@ -402,10 +402,12 @@
 L:	linux-hams@vger.kernel.org
 S:	Maintained
 
-DC390/AM53C974 SCSI driver
+DC390/AM53C974 and DC395/TRM-S1040 SCSI drivers
 P:	Kurt Garloff
 M:	garloff@suse.de
-W:	http://www.garloff.de/kurt/linux/dc390/
+M:	kurt@garloff.de
+W:	http://www.garloff.de/kurt/linux/
+L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
 DECnet NETWORK LAYER
diff -uNr linux/drivers/scsi/Config.help linux-2.5.5-dj2-dc395/drivers/scsi/Config.help
--- linux/drivers/scsi/Config.help	Wed Feb 27 12:22:09 2002
+++ linux-2.5.5-dj2-dc395/drivers/scsi/Config.help	Thu Feb 28 06:03:39 2002
@@ -1135,6 +1135,18 @@
   say M here and read <file:Documentation/modules.txt>.  The module
   will be called sim710.o.
 
+CONFIG_SCSI_DC395x_TRMS1040
+  This driver supports the PCI SCSI host adapters baseds on Tekram's
+  ASIC TRM-S1040 chip, i.e. Tekram DC315 and DC395 variants.
+  This driver does work, but please note that it is still beta status,
+  so better have a bootable disk and a backup in case of emergency.
+  Please read the file <file:drivers/scsi/README.dc395x>.
+
+  If you want to compile this 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 dc395x_trm.o.
+
 CONFIG_SCSI_DC390T
   This driver supports PCI SCSI host adapters based on the Am53C974A
   chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard
diff -uNr linux/drivers/scsi/Config.in linux-2.5.5-dj2-dc395/drivers/scsi/Config.in
--- linux/drivers/scsi/Config.in	Wed Feb 27 12:22:09 2002
+++ linux-2.5.5-dj2-dc395/drivers/scsi/Config.in	Thu Feb 28 06:03:55 2002
@@ -183,6 +183,9 @@
 dep_tristate 'Simple 53c710 SCSI support (Compaq, NCR machines)' CONFIG_SCSI_SIM710 $CONFIG_SCSI
 dep_tristate 'Symbios 53c416 SCSI support' CONFIG_SCSI_SYM53C416 $CONFIG_SCSI
 if [ "$CONFIG_PCI" = "y" ]; then
+   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+     dep_tristate 'Tekram DC395/U/UW and DC315/U SCSI support' CONFIG_SCSI_DC395x_TRMS1040 $CONFIG_SCSI
+   fi
    dep_tristate 'Tekram DC390(T) and Am53/79C974 SCSI support' CONFIG_SCSI_DC390T $CONFIG_SCSI
    if [ "$CONFIG_SCSI_DC390T" != "n" ]; then
       bool '  _omit_ support for non-DC390 adapters' CONFIG_SCSI_DC390T_NOGENSUPP
diff -uNr linux/drivers/scsi/Makefile linux-2.5.5-dj2-dc395/drivers/scsi/Makefile
--- linux/drivers/scsi/Makefile	Wed Feb 27 12:22:09 2002
+++ linux-2.5.5-dj2-dc395/drivers/scsi/Makefile	Thu Feb 28 06:03:55 2002
@@ -100,6 +100,7 @@
 obj-$(CONFIG_SCSI_IBMMCA)	+= ibmmca.o
 obj-$(CONFIG_SCSI_EATA)		+= eata.o
 obj-$(CONFIG_SCSI_DC390T)	+= tmscsim.o
+obj-$(CONFIG_SCSI_DC395x_TRMS1040)	+= dc395x_trm.o
 obj-$(CONFIG_SCSI_AM53C974)	+= AM53C974.o
 obj-$(CONFIG_SCSI_MEGARAID)	+= megaraid.o
 obj-$(CONFIG_SCSI_ACARD)	+= atp870u.o