patch-2.1.54 linux/init/main.c

• Lines: 91
• Date: Sat Sep 6 10:04:16 1997
• Orig file: v2.1.53/linux/init/main.c
• Orig date: Mon Aug 4 16:25:40 1997

diff -u --recursive --new-file v2.1.53/linux/init/main.c linux/init/main.c
@@ -72,6 +72,7 @@
 extern unsigned long pci_init(unsigned long, unsigned long);
 extern long mca_init(long, long);
 extern long sbus_init(long, long);
+extern long powermac_init(unsigned long, unsigned long);
 extern void sysctl_init(void);
 extern void filescache_init(void);
 
@@ -86,6 +87,18 @@
 extern void lp_setup(char *str, int *ints);
 #endif
 extern void eth_setup(char *str, int *ints);
+#ifdef CONFIG_ARCNET_COM20020
+extern void com20020_setup(char *str, int *ints);
+#endif
+#ifdef CONFIG_ARCNET_RIM_I
+extern void arcrimi_setup(char *str, int *ints);
+#endif
+#ifdef CONFIG_ARCNET_COM90xxIO
+extern void com90io_setup(char *str, int *ints);
+#endif
+#ifdef CONFIG_ARCNET_COM90xx
+extern void com90xx_setup(char *str, int *ints);
+#endif
 #ifdef CONFIG_DECNET
 extern void decnet_setup(char *str, int *ints);
 #endif
@@ -212,6 +225,10 @@
 #ifdef CONFIG_SOUNDMODEM
 extern void sm_setup(char *str, int *ints);
 #endif
+#ifdef CONFIG_PMAC_CONSOLE
+extern void pmac_cons_setup(char *str, int *ints);
+extern void pmac_vmode_setup(char *str, int *ints);
+#endif
 #ifdef CONFIG_WDT
 extern void wdt_setup(char *str, int *ints);
 #endif
@@ -221,6 +238,9 @@
 #ifdef CONFIG_PLIP
 extern void plip_setup(char *str, int *ints);
 #endif
+#ifdef CONFIG_HFMODEM
+extern void hfmodem_setup(char *str, int *ints);
+#endif
 
 #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
 extern void ipc_init(void);
@@ -329,6 +349,18 @@
 #ifdef CONFIG_INET
 	{ "ether=", eth_setup },
 #endif
+#ifdef CONFIG_ARCNET_COM20020
+	{ "com20020=", com20020_setup },
+#endif
+#ifdef CONFIG_ARCNET_RIM_I
+	{ "arcrimi=", arcrimi_setup },
+#endif
+#ifdef CONFIG_ARCNET_COM90xxIO
+	{ "com90io=", com90io_setup },
+#endif
+#ifdef CONFIG_ARCNET_COM90xx
+	{ "com90xx=", com90xx_setup },
+#endif
 #ifdef CONFIG_DECNET
 	{ "decnet=", decnet_setup },
 #endif
@@ -517,6 +549,13 @@
 #ifdef CONFIG_PLIP
 	{ "plip=", plip_setup },
 #endif
+#ifdef CONFIG_SOUNDMODEM
+	{ "hfmodem=", hfmodem_setup },
+#endif
+#ifdef CONFIG_PMAC_CONSOLE
+	{ "console=", pmac_cons_setup },
+	{ "vmode=", pmac_vmode_setup },
+#endif
 	{ 0, 0 }
 };
 
@@ -875,6 +914,9 @@
 	}
 #ifdef CONFIG_SBUS
 	memory_start = sbus_init(memory_start,memory_end);
+#endif
+#ifdef CONFIG_PMAC
+	memory_start = powermac_init(memory_start, memory_end);
 #endif
 	memory_start = console_init(memory_start,memory_end);
 #ifdef CONFIG_PCI