diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/char/misc.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index e2b5bfa41..8b4b16b99 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -65,13 +65,16 @@ static struct miscdevice misc_list = { 0, "head", NULL, &misc_list, &misc_list } static unsigned char misc_minors[DYNAMIC_MINORS / 8]; #ifndef MODULE +extern int adbdev_init(void); extern int bus_mouse_init(void); extern int psaux_init(void); extern int ms_bus_mouse_init(void); extern int atixl_busmouse_init(void); extern int amiga_mouse_init(void); extern int atari_mouse_init(void); +extern int mac_mouse_init(void); extern int sun_mouse_init(void); +extern int adb_mouse_init(void); extern void gfx_register(void); extern void streamable_init(void); extern void watchdog_init(void); @@ -79,13 +82,13 @@ extern void wdt_init(void); extern void acq_init(void); extern void pcwatchdog_init(void); extern int rtc_init(void); +extern int ds1286_init(void); extern int dsp56k_init(void); extern int nvram_init(void); extern int radio_init(void); extern void hfmodem_init(void); -#ifdef CONFIG_PC110_PAD extern int pc110pad_init(void); -#endif +extern int pmu_device_init(void); #ifdef CONFIG_PROC_FS static int misc_read_proc(char *buf, char **start, off_t offset, @@ -206,6 +209,9 @@ __initfunc(int misc_init(void)) if (proc_misc) proc_misc->read_proc = misc_read_proc; #endif /* PROC_FS */ +#ifdef CONFIG_MAC + adbdev_init(); +#endif #ifdef CONFIG_BUSMOUSE bus_mouse_init(); #endif @@ -224,9 +230,15 @@ __initfunc(int misc_init(void)) #ifdef CONFIG_ATARIMOUSE atari_mouse_init(); #endif +#ifdef CONFIG_MACMOUSE + mac_mouse_init(); +#endif #ifdef CONFIG_SUN_MOUSE sun_mouse_init(); #endif +#ifdef CONFIG_MACMOUSE + adb_mouse_init(); +#endif #ifdef CONFIG_PC110_PAD pc110pad_init(); #endif @@ -254,7 +266,7 @@ __initfunc(int misc_init(void)) #ifdef CONFIG_H8 h8_init(); #endif -#ifdef CONFIG_RTC +#if defined(CONFIG_RTC) || defined(CONFIG_SUN_MOSTEK_RTC) rtc_init(); #endif #ifdef CONFIG_SGI_DS1286 @@ -275,6 +287,9 @@ __initfunc(int misc_init(void)) #ifdef CONFIG_HFMODEM hfmodem_init(); #endif +#ifdef CONFIG_PMAC_PBOOK + pmu_device_init(); +#endif #ifdef CONFIG_SGI_GRAPHICS gfx_register (); streamable_init (); |