diff options
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index aee35a3eb..95dbdaab2 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -70,8 +70,6 @@ extern int psaux_init(void); extern void gfx_register(void); #endif extern void streamable_init(void); -extern void watchdog_init(void); -extern void pcwatchdog_init(void); extern int rtc_sun_init(void); /* Combines MK48T02 and MK48T08 */ extern int rtc_DP8570A_init(void); extern int rtc_MK48T08_init(void); @@ -81,6 +79,7 @@ extern int radio_init(void); extern int pc110pad_init(void); extern int pmu_device_init(void); extern int qpmouse_init(void); +extern int tosh_init(void); static int misc_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *private) @@ -254,18 +253,6 @@ int __init misc_init(void) #ifdef CONFIG_PC110_PAD pc110pad_init(); #endif -/* - * Only one watchdog can succeed. We probe the pcwatchdog first, - * then the wdt cards and finally the software watchdog which always - * works. This means if your hardware watchdog dies or is 'borrowed' - * for some reason the software watchdog still gives you some cover. - */ -#ifdef CONFIG_PCWATCHDOG - pcwatchdog_init(); -#endif -#ifdef CONFIG_SOFT_WATCHDOG - watchdog_init(); -#endif #ifdef CONFIG_MVME16x rtc_MK48T08_init(); #endif @@ -299,6 +286,9 @@ int __init misc_init(void) #ifdef CONFIG_SGI streamable_init (); #endif +#ifdef CONFIG_TOSHIBA + tosh_init(); +#endif if (devfs_register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { printk("unable to get major %d for misc devices\n", MISC_MAJOR); |