diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/char/videodev.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'drivers/char/videodev.c')
| -rw-r--r-- | drivers/char/videodev.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/char/videodev.c b/drivers/char/videodev.c index 0a4e65c57..60990d1db 100644 --- a/drivers/char/videodev.c +++ b/drivers/char/videodev.c @@ -47,6 +47,9 @@ extern int i2c_tuner_init(struct video_init *); #ifdef CONFIG_VIDEO_BWQCAM extern int init_bw_qcams(struct video_init *); #endif +#ifdef CONFIG_VIDEO_CPIA +extern int cpia_init(struct video_init *); +#endif #ifdef CONFIG_VIDEO_PLANB extern int init_planbs(struct video_init *); #endif @@ -62,6 +65,9 @@ static struct video_init video_init_list[]={ #ifdef CONFIG_VIDEO_BWQCAM {"bw-qcam", init_bw_qcams}, #endif +#ifdef CONFIG_VIDEO_CPIA + {"cpia", cpia_init}, +#endif #ifdef CONFIG_VIDEO_PLANB {"planb", init_planbs}, #endif @@ -133,9 +139,11 @@ static int video_open(struct inode *inode, struct file *file) if(vfl==NULL) { char modname[20]; + MOD_INC_USE_COUNT; sprintf (modname, "char-major-%d-%d", VIDEO_MAJOR, minor); request_module(modname); vfl=video_device[minor]; + MOD_DEC_USE_COUNT; if (vfl==NULL) return -ENODEV; } |