summaryrefslogtreecommitdiffstats
path: root/drivers/char/videodev.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
commit03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch)
tree88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/char/videodev.c
parent257730f99381dd26e10b832fce4c94cae7ac1176 (diff)
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/char/videodev.c')
-rw-r--r--drivers/char/videodev.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/videodev.c b/drivers/char/videodev.c
index 868ba4eb9..2ba0bd030 100644
--- a/drivers/char/videodev.c
+++ b/drivers/char/videodev.c
@@ -62,6 +62,9 @@ extern int rtrack_init(struct video_init *);
#ifdef CONFIG_RADIO_SF16FMI
extern int fmi_init(struct video_init *);
#endif
+#ifdef CONFIG_RADIO_MIROPCM20
+extern int pcm20_init(struct video_init *);
+#endif
static struct video_init video_init_list[]={
#ifdef CONFIG_VIDEO_BT848
@@ -88,6 +91,9 @@ static struct video_init video_init_list[]={
#endif
#ifdef CONFIG_RADIO_SF16FMI
{"SF16FMI", fmi_init},
+#endif
+#ifdef CONFIG_RADIO_MIROPCM20
+ {"PCM20", pcm20_init},
#endif
{"end", NULL}
};
@@ -315,6 +321,7 @@ static struct file_operations video_fops=
video_ioctl,
video_mmap,
video_open,
+ NULL, /* flush */
video_release
};