diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/videodev.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/videodev.c')
| -rw-r--r-- | drivers/char/videodev.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/char/videodev.c b/drivers/char/videodev.c index 2ba0bd030..def6e7039 100644 --- a/drivers/char/videodev.c +++ b/drivers/char/videodev.c @@ -53,6 +53,9 @@ extern int init_colour_qcams(struct video_init *); #ifdef CONFIG_VIDEO_BWQCAM extern int init_bw_qcams(struct video_init *); #endif +#ifdef CONFIG_VIDEO_PLANB +extern int init_planbs(struct video_init *); +#endif #ifdef CONFIG_RADIO_AZTECH extern int aztech_init(struct video_init *); #endif @@ -65,6 +68,9 @@ extern int fmi_init(struct video_init *); #ifdef CONFIG_RADIO_MIROPCM20 extern int pcm20_init(struct video_init *); #endif +#ifdef CONFIG_VIDEO_PMS +extern int init_pms_cards(struct video_init *); +#endif static struct video_init video_init_list[]={ #ifdef CONFIG_VIDEO_BT848 @@ -83,6 +89,9 @@ static struct video_init video_init_list[]={ #ifdef CONFIG_VIDEO_PMS {"PMS", init_pms_cards}, #endif +#ifdef CONFIG_VIDEO_PLANB + {"planb", init_planbs}, +#endif #ifdef CONFIG_RADIO_AZTECH {"Aztech", aztech_init}, #endif @@ -333,7 +342,7 @@ int videodev_init(void) { struct video_init *vfli = video_init_list; - printk(KERN_INFO "Linux video capture interface: v0.01 ALPHA\n"); + printk(KERN_INFO "Linux video capture interface: v1.00\n"); if(register_chrdev(VIDEO_MAJOR,"video_capture", &video_fops)) { printk("video_dev: unable to get major %d\n", VIDEO_MAJOR); |