diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/misc.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index ae05abcfd..9b5b5fc20 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -80,6 +80,7 @@ extern void acq_init(void); extern void dtlk_init(void); extern void pcwatchdog_init(void); extern int rtc_init(void); +extern int rtc_sun_init(void); /* Combines MK48T02 and MK48T08 */ extern int ds1286_init(void); extern int dsp56k_init(void); extern int nvram_init(void); @@ -250,7 +251,10 @@ int __init misc_init(void) #ifdef CONFIG_BVME6000 rtc_DP8570A_init(); #endif -#if defined(CONFIG_RTC) || defined(CONFIG_SUN_MOSTEK_RTC) +#if defined(CONFIG_SUN_MOSTEK_RTC) + rtc_sun_init(); +#endif +#if defined(CONFIG_RTC) rtc_init(); #endif #ifdef CONFIG_SGI_DS1286 |