patch-2.1.124 linux/init/main.c

• Lines: 65
• Date: Sun Oct 4 10:22:45 1998
• Orig file: v2.1.123/linux/init/main.c
• Orig date: Mon Sep 28 10:51:36 1998

diff -u --recursive --new-file v2.1.123/linux/init/main.c linux/init/main.c
@@ -78,8 +78,8 @@
 extern void sock_init(void);
 extern void uidcache_init(void);
 extern void mca_init(void);
-extern long sbus_init(void);
-extern long powermac_init(unsigned long, unsigned long);
+extern void sbus_init(void);
+extern void powermac_init(void);
 extern void sysctl_init(void);
 extern void filescache_init(void);
 extern void signals_init(void);
@@ -305,6 +305,9 @@
 #ifdef CONFIG_FTAPE
 extern void ftape_setup(char *str, int *ints);
 #endif
+#ifdef CONFIG_MDA_CONSOLE
+extern void mdacon_setup(char *str, int *ints);
+#endif
 
 #if defined(CONFIG_SYSVIPC)
 extern void ipc_init(void);
@@ -317,10 +320,6 @@
 extern void md_setup(char *str,int *ints) __init;
 #endif
 
-#ifdef __sparc__
-extern int serial_console;
-#endif
-
 /*
  * Boot command-line arguments
  */
@@ -456,6 +455,7 @@
 #endif
 #ifdef CONFIG_BLK_DEV_PS2
 	{ "eda",     0x2400 },
+	{ "edb",     0x2440 },
 #endif
 #ifdef CONFIG_PARIDE_PD
 	{ "pda",	0x2d00 },
@@ -544,10 +544,13 @@
 #endif
 	{ "panic=", panic_setup },
 	{ "console=", console_setup },
-#ifdef CONFIG_VT
 #ifdef CONFIG_VGA_CONSOLE
 	{ "no-scroll", no_scroll },
 #endif
+#ifdef CONFIG_MDA_CONSOLE
+	{ "mdacon=", mdacon_setup },
+#endif
+#ifdef CONFIG_VT
 	{ "kbd-reset", kbd_reset_setup },
 #endif
 #ifdef CONFIG_BUGi386
@@ -664,7 +667,8 @@
 	{ "floppy=", floppy_setup },
 #endif
 #ifdef CONFIG_BLK_DEV_PS2
-	{ "ed=", ed_setup },
+	{ "eda=", ed_setup },
+	{ "edb=", ed_setup },
 	{ "tp720=", tp720_setup },
 #endif
 #ifdef CONFIG_CDU31A