Various changes to Makefiles and Config.in files to be able to make use of the new DECstation and Baget stuff :-)

6 files changed, 58 insertions, 4 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index acd62b540..8f060eaef 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,6 +34,10 @@ ifdef CONFIG_NUBUS
 SUB_DIRS += nubus
 endif
 
+ifdef CONFIG_TC
+SUB_DIRS += tc
+endif
+
 ifdef CONFIG_VT
 SUB_DIRS += video
 MOD_SUB_DIRS += video
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 7544ffb4a..9a3bab5e1 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -31,20 +31,30 @@ endif
 ifeq ($(CONFIG_SERIAL),y)
   ifeq ($(CONFIG_SUN_SERIAL),)
     ifeq ($(CONFIG_SGI_SERIAL),)
+      ifeq ($(CONFIG_DECSTATION),)
+	ifeq ($(CONFIG_BAGET_MIPS),)
       LX_OBJS += serial.o
     endif
   endif
+    endif
+  endif
 else
   ifeq ($(CONFIG_SERIAL),m)
     ifeq ($(CONFIG_SUN_SERIAL),)
       ifeq ($(CONFIG_SGI_SERIAL),)
+        ifeq ($(CONFIG_DECSTATION),)
+          ifeq ($(CONFIG_BAGET_MIPS),)
       MX_OBJS += serial.o
       endif
     endif
   endif
+    endif
+  endif
 endif
 
 ifndef CONFIG_SUN_KEYBOARD
+ifndef CONFIG_DECSTATION
+ifndef CONFIG_BAGET_MIPS
 ifdef CONFIG_VT
 L_OBJS += keyboard.o
 endif
@@ -55,6 +65,8 @@ ifdef CONFIG_MAGIC_SYSRQ
 L_OBJS += sysrq.o
 endif
 endif
+endif
+endif
 
 ifeq ($(CONFIG_ATARI_DSP56K),y)
 L_OBJS += dsp56k.o
@@ -444,6 +456,10 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_DZ),y)
+  L_OBJS += dz.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 fastdep:
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 572e4ec27..22fe2bae3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -875,6 +875,22 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_BAGETLANCE),y)
+L_OBJS += bagetlance.o
+else
+  ifeq ($(CONFIG_BAGETLANCE),m)
+  M_OBJS += bagetlance.o
+  endif
+endif
+
+ifeq ($(CONFIG_DECLANCE),y)
+L_OBJS += declance.o
+else
+  ifeq ($(CONFIG_DECLANCE),m)
+  M_OBJS += declance.o
+  endif
+endif
+
 ifeq ($(CONFIG_ATARILANCE),y)
 L_OBJS += atarilance.o
 else
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index eece1bfe3..8c3f51ee7 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -109,6 +109,8 @@ extern int am79c961_probe(struct device *dev);
 extern int epic100_probe(struct device *dev);
 extern int rtl8139_probe(struct device *dev);
 extern int hplance_probe(struct device *dev);
+extern int bagetlance_probe(struct device *);
+extern int dec_lance_probe(struct device *);
 extern int via_rhine_probe(struct device *dev);
 extern int tc515_probe(struct device *dev);
 extern int lance_probe(struct device *dev);
@@ -438,6 +440,15 @@ struct devprobe mips_probes[] __initdata = {
 #ifdef CONFIG_MIPS_JAZZ_SONIC
 	{sonic_probe, 0},
 #endif
+#ifdef CONFIG_DECLANCE		/* DECstation on-board controller */
+	{dec_lance_probe, 0},   /* and maybe TURBOchannel option boards */
+#endif
+#ifdef CONFIG_BAGETLANCE        /* Lance-based Baget ethernet boards */
+        {bagetlance_probe, 0},
+#endif
+#ifdef CONFIG_BAGETBSM         /* Baget backplane shared memory */
+        {bsm_probe, 0},
+#endif
 	{NULL, 0},
 };
 
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 28c11f7b6..b7d5c5814 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -588,6 +588,10 @@ ifeq ($(CONFIG_JAZZ_ESP),y)
 L_OBJS += NCR53C9x.o jazz_esp.o
 endif
 
+ifeq ($(CONFIG_SCSI_DECNCR),y)
+L_OBJS += NCR53C9x.o dec_esp.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 53c8xx_d.h: 53c7,8xx.scr script_asm.pl
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 58698132b..79781bc42 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -291,10 +291,6 @@
 #include "scsi_debug.h"
 #endif
 
-#ifdef CONFIG_JAZZ_ESP
-#include "jazz_esp.h"
-#endif
-
 #ifdef CONFIG_SCSI_ACORNSCSI_3
 #include "../acorn/scsi/acornscsi.h"
 #endif
@@ -323,6 +319,10 @@
 #include "jazz_esp.h"
 #endif
 
+#ifdef CONFIG_SCSI_DECNCR
+#include "dec_esp.h"
+#endif
+
 /*
  * Moved ppa driver to the end of the probe list
  * since it is a removable host adapter.
@@ -576,6 +576,9 @@ static Scsi_Host_Template builtin_scsi_hosts[] =
     POWERTECSCSI,
 #endif
 #endif
+#ifdef CONFIG_SCSI_DECNCR	
+    SCSI_DEC_ESP,
+#endif	
 /* "Removable host adapters" below this line (Parallel Port/USB/other) */
 #ifdef CONFIG_SCSI_PPA
     PPA,