diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /init | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 659f86b2e..3fd84b60f 100644 --- a/init/main.c +++ b/init/main.c @@ -75,6 +75,7 @@ extern void uidcache_init(void); 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); @@ -89,6 +90,18 @@ extern void msmouse_setup(char *str, int *ints); 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 @@ -215,6 +228,10 @@ extern void baycom_setup(char *str, int *ints); #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 @@ -224,6 +241,9 @@ extern void parport_setup(char *str, int *ints); #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); @@ -340,6 +360,18 @@ struct { #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 @@ -528,6 +560,13 @@ struct { #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 } }; @@ -887,6 +926,9 @@ __initfunc(asmlinkage void start_kernel(void)) #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_REMOTE_DEBUG set_debug_traps(); |