diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/char/misc.c | |
parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) |
Merge with Linux 2.1.67.
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 826863ec0..e1819d9f2 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -78,6 +78,7 @@ extern void pcwatchdog_init(void); extern int rtc_init(void); extern int dsp56k_init(void); extern int nvram_init(void); +extern int radio_init(void); extern void hfmodem_init(void); #ifdef CONFIG_PROC_FS @@ -117,7 +118,7 @@ static int misc_open(struct inode * inode, struct file * file) return -ENODEV; } - if ((file->f_op = c->fops)) + if ((file->f_op = c->fops) && file->f_op->open) return file->f_op->open(inode,file); else return -ENODEV; @@ -259,6 +260,9 @@ __initfunc(int misc_init(void)) #ifdef CONFIG_NVRAM nvram_init(); #endif +#ifdef CONFIG_MISC_RADIO + radio_init(); +#endif #ifdef CONFIG_HFMODEM hfmodem_init(); #endif |