Cleanup, sync with others sources.

7 files changed, 7 insertions, 32 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 38439d32a..58af28821 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -8,8 +8,8 @@
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
 SUB_DIRS     := block char net misc sound
-MOD_SUB_DIRS := $(SUB_DIRS) sbus
-ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi cdrom isdn misc pnp \
+MOD_SUB_DIRS := $(SUB_DIRS)
+ALL_SUB_DIRS := $(SUB_DIRS) pci sgi scsi sbus cdrom isdn misc pnp \
 				macintosh video dio zorro fc4 usb
 
 ifdef CONFIG_DIO
diff --git a/drivers/char/Config.in b/drivers/char/Config.in
index c6d225616..6c9f0a651 100644
--- a/drivers/char/Config.in
+++ b/drivers/char/Config.in
@@ -133,8 +133,8 @@ if [ "$CONFIG_VIDEO_DEV" != "n" ]; then
     dep_tristate 'BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV
   fi
   if [ "$CONFIG_PARPORT" != "n" ]; then
-    dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV
-    dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV
+    dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
+    dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
   fi
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
     if [ "$CONFIG_SGI" = "y" ]; then
diff --git a/drivers/char/console.c b/drivers/char/console.c
index f04a00708..2005390d9 100644
--- a/drivers/char/console.c
+++ b/drivers/char/console.c
@@ -1044,7 +1044,7 @@ static void csi_m(int currcons)
 				toggle_meta = 0;
 				break;
 			case 11: /* ANSI X3.64-1979 (SCO-ish?)
-				  * Select first alternate font, let's
+				  * Select first alternate font, lets
 				  * chars < 32 be displayed as ROM chars.
 				  */
 				translate = set_translate(IBMPC_MAP,currcons);
@@ -2346,7 +2346,7 @@ __initfunc(unsigned long con_init(unsigned long kmem_start))
 		screenbuf = (unsigned short *) kmem_start;
 		kmem_start += screenbuf_size;
 		kmalloced = 0;
-		vc_init(currcons, video_num_lines, video_num_columns,
+		vc_init(currcons, video_num_lines, video_num_columns, 
 			currcons || !sw->con_save_screen);
 		for (j=k=0; j<16; j++) {
 			vc_cons[currcons].d->vc_palette[k++] = default_red[j] ;
@@ -2354,7 +2354,6 @@ __initfunc(unsigned long con_init(unsigned long kmem_start))
 			vc_cons[currcons].d->vc_palette[k++] = default_blu[j] ;
 		}
 	}
-
 	currcons = fg_console = 0;
 	master_display_fg = vc_cons[currcons].d;
 	set_origin(currcons);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 8b5fcc00c..b7f51e2f3 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -88,7 +88,7 @@ unsigned int video_scan_lines;
  * comments - KDMKTONE doesn't put the process to sleep.
  */
 
-#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \
     || (defined(__mips__) && !defined(CONFIG_SGI))
 
 static void
diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index c73d1c9ce..aefc79a30 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -122,10 +122,6 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
     tristate 'CS89x0 support' CONFIG_CS89x0
     tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
     tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
-    if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
-      tristate 'Cobalt DECchip Tulip (dc21x4x) onboard support' CONFIG_COBALT_TULIP
-    fi
-    tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
     tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
     tristate 'EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9f1da33e6..ce0e46784 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -171,9 +171,6 @@ __initfunc(static int probe_list(struct device *dev, struct devprobe *plist))
  * list instead.
  */
 struct devprobe pci_probes[] __initdata = {
-#ifdef CONFIG_COBALT_TULIP
-	{tulip_probe, 0},
-#endif
 #ifdef CONFIG_DGRS
 	{dgrs_probe, 0},
 #endif
@@ -454,9 +451,6 @@ struct devprobe mips_probes[] __initdata = {
 #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/video/Makefile b/drivers/video/Makefile
index 4d07ae843..e7617637d 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -218,10 +218,6 @@ ifdef CONFIG_FB_G364
 L_OBJS := $(L_OBJS) g364fb.o
 endif
 
-ifdef CONFIG_FB_G364
-L_OBJS := $(L_OBJS) g364fb.o
-endif
-
 ifdef CONFIG_FB_FM2
 L_OBJS := $(L_OBJS) fm2fb.o
 endif
@@ -502,16 +498,6 @@ else
   endif
 endif
 
-# Newport Text Console
-
-ifeq ($(CONFIG_SGI_NEWPORT_CONSOLE),y)
-L_OBJS += newport_con.o vga_font.o
-else
-  ifeq ($(CONFIG_SGI_NEWPORT_CONSOLE),m)
-  M_OBJS += newport_con.o vga_font.o
-  endif
-endif
-
 include $(TOPDIR)/Rules.make
 
 promcon_tbl.c: prom.uni ../char/conmakehash