setup.c again - while uucp transferring ...

[Florian Lohoff <flo@rfc822.org>]

Obviously even a bit better :)

Index: setup.c
===================================================================
RCS file: /cvs/linux/arch/mips/sgi/kernel/setup.c,v
retrieving revision 1.30
diff -u -r1.30 setup.c
--- setup.c     2000/03/26 23:45:03     1.30
+++ setup.c     2000/04/02 07:45:07
@@ -30,9 +30,10 @@
 #ifdef CONFIG_REMOTE_DEBUG
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
+static int remote_debug = 0;
 #endif
 
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_PROM_CONSOLE)
+#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SGI_PROM_CONSOLE)
 extern void console_setup(char *);
 #endif
 
@@ -40,8 +41,6 @@
 void indy_reboot_setup(void);
 void sgi_volume_set(unsigned char);
 
-static int remote_debug = 0;
-
 #define sgi_kh ((struct hpc_keyb *) (KSEG1 + 0x1fbd9800 + 64))
 
 #define KBD_STAT_IBF           0x02    /* Keyboard input buffer full */
@@ -197,9 +196,9 @@
 #endif
 
 #ifdef CONFIG_SGI_PROM_CONSOLE
-       console_setup("ttyS0", NULL);
+       console_setup("ttyS0");
 #endif
-  
+
        sgi_volume_set(simple_strtoul(ArcGetEnvironmentVariable("volume"), 
NULL, 10));
 
 #ifdef CONFIG_VT


-- 
Florian Lohoff          flo@rfc822.org                  +49-5241-470566
"Technology is a constant battle between manufacturers producing bigger and
more idiot-proof systems and nature producing bigger and better idiots."