Lots of cleanup from Keith with additional tweaks by me. More to

come.  Stay frightened :-)

4 files changed, 18 insertions, 16 deletions

diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index 6597957c1..d9b736858 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -173,6 +173,16 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
       tristate '    D-Link DE600 pocket adapter support' CONFIG_DE600
       tristate '    D-Link DE620 pocket adapter support' CONFIG_DE620
    fi
+   if [ "$CONFIG_SGI_IP22" = "y" ]; then
+      bool '  SGI Seeq ethernet controller support' CONFIG_SGISEEQ
+   fi
+   if [ "$CONFIG_DECSTATION" = "y" ]; then
+      bool '  DEC LANCE ethernet controller support' CONFIG_DECLANCE
+   fi 
+   if [ "$CONFIG_BAGET_MIPS" = "y" ]; then
+      tristate '  Baget AMD LANCE support' CONFIG_BAGETLANCE
+      tristate '  Baget Backplane Shared Memory support' CONFIG_BAGETBSM
+   fi
 fi
 
 endmenu
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 877842224..4c9c23c0b 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -2356,6 +2356,7 @@ void scsi_unregister_module(int module_type, void *ptr)
 	case MODULE_SCSI_IOCTL:
 		break;
 	default:
+		break;
 	}
 	return;
 }
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c
index bf4899735..c3fe683a9 100644
--- a/drivers/sgi/char/sgiserial.c
+++ b/drivers/sgi/char/sgiserial.c
@@ -325,7 +325,7 @@ static void rs_start(struct tty_struct *tty)
  */
 static void batten_down_hatches(void)
 {
-	prom_imode();
+	ArcEnterInteractiveMode();
 #if 0
 	/* If we are doing kadb, we call the debugger
 	 * else we just drop into the boot monitor.
@@ -1793,13 +1793,10 @@ static inline struct sgi_zslayout *get_zs(int chip)
 {
 	extern struct hpc3_miscregs *hpc3mregs;
 
-	if(chip > 0) {
-		prom_printf("Wheee, bogus zs chip number requested.\n");
-		prom_getchar();
-		romvec->imode();
-	}
-	return (struct sgi_zslayout *) (&hpc3mregs->ser1cmd);
+	if (chip > 0)
+		panic("Wheee, bogus zs chip number requested.");
 
+	return (struct sgi_zslayout *) (&hpc3mregs->ser1cmd);
 }
 
 
@@ -1829,12 +1826,8 @@ rs_cons_check(struct sgi_serial *ss, int channel)
 	}
 	if(o && i)
 		io = 1;
-	if(ss->zs_baud != 9562) { /* Don't ask... */
-		prom_printf("BAD console baud rate %d\n", ss->zs_baud);
-		prom_getchar();
-		prom_imode();
-		panic("Console baud rate weirdness");
-	}
+	if (ss->zs_baud != 9562)	/* Don't ask... */
+		panic("Bad console baud rate %d", ss->zs_baud);
 
 
 	/* Set flag variable for this port so that it cannot be
@@ -1843,7 +1836,7 @@ rs_cons_check(struct sgi_serial *ss, int channel)
 	ss->is_cons = 1;
 
 	if(io) {
-		if(!msg_printed) {
+		if (!msg_printed) {
 			printk("zs%d: console I/O\n", ((channel>>1)&1));
 			msg_printed = 1;
 		}
@@ -1851,7 +1844,6 @@ rs_cons_check(struct sgi_serial *ss, int channel)
 	} else {
 		printk("zs%d: console %s\n", ((channel>>1)&1),
 		       (i==1 ? "input" : (o==1 ? "output" : "WEIRD")));
-
 	}
 }
 
diff --git a/drivers/video/Config.in b/drivers/video/Config.in
index dfd8e10c5..95ff6ecfe 100644
--- a/drivers/video/Config.in
+++ b/drivers/video/Config.in
@@ -408,5 +408,4 @@ if [ "$CONFIG_FB" = "y" ]; then
       fi
    fi
 fi
-
 endmenu