--- linux/drivers/scsi/Config.in.ORIG	Wed Jun 16 23:32:33 1999
+++ linux/drivers/scsi/Config.in	Mon Jun 28 21:55:47 1999
@@ -126,6 +126,7 @@
 fi
 dep_tristate 'Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE $CONFIG_SCSI
 if [ "$CONFIG_PCI" = "y" ]; then
+  dep_tristate 'Tekram DC395/U/UW and DC315/U SCSI support' CONFIG_SCSI_DC395x_TRMS1040 $CONFIG_SCSI
   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
--- linux/drivers/scsi/Makefile.ORIG	Wed Jun 16 23:32:19 1999
+++ linux/drivers/scsi/Makefile	Mon Jun 28 21:53:11 1999
@@ -346,6 +346,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_SCSI_DC395x_TRMS1040),y)
+L_OBJS += dc395x_trm.o
+else
+  ifeq ($(CONFIG_SCSI_DC395x_TRMS1040),m)
+  M_OBJS += dc395x_trm.o
+  endif
+endif
+
 ifeq ($(CONFIG_SCSI_DC390T),y)
 L_OBJS += tmscsim.o
 else
--- linux/drivers/scsi/hosts.c.ORIG	Wed Jun 16 23:46:03 1999
+++ linux/drivers/scsi/hosts.c	Mon Jun 28 21:58:44 1999
@@ -231,6 +231,10 @@
 #include "sym53c416.h" 
 #endif
 
+#ifdef CONFIG_SCSI_DC395x_TRMS1040
+#include "dc395x_trm.h"
+#endif
+
 #ifdef CONFIG_SCSI_DC390T
 #include "dc390.h"
 #endif
@@ -529,6 +533,9 @@
 #endif
 #ifdef CONFIG_SCSI_EATA
     EATA,
+#endif
+#ifdef CONFIG_SCSI_DC395x_TRMS1040
+    DC395x_TRMS1040,
 #endif
 #ifdef CONFIG_SCSI_DC390T
     DC390_T,
--- linux/include/linux/proc_fs.h.ORIG	Mon Jun 28 18:38:28 1999
+++ linux/include/linux/proc_fs.h	Mon Jun 28 22:03:51 1999
@@ -183,6 +183,7 @@
 	PROC_SCSI_IBMMCA,
 	PROC_SCSI_FD_MCS,
 	PROC_SCSI_EATA2X,
+	PROC_SCSI_DC395X_TRMS1040,
 	PROC_SCSI_DC390T,
 	PROC_SCSI_AM53C974,
 	PROC_SCSI_SSC,
--- linux/Documentation/Configure.help.ORIG	Mon Jun 28 18:11:35 1999
+++ linux/Documentation/Configure.help	Mon Jun 28 22:10:44 1999
@@ -4673,6 +4673,18 @@
   read Documentation/modules.txt. The module will be called
   sym53c416.o. 
 
+Tekram DC395/U/UW and DC315/U SCSI support
+CONFIG_SCSI_DC395x_TRM1040S
+  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 alpha status,
+  so better have a bootable disk and a backup in case of emergency.
+  
+  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 Documentation/modules.txt. The module will be
+  called dc395x_trm.o.
+
 Tekram DC390(T) and Am53/79C974 (PCscsi) SCSI support
 CONFIG_SCSI_DC390T
   This driver supports PCI SCSI host adapters based on the Am53C974A