patch-2.1.81 linux/drivers/char/videodev.c

• Lines: 51
• Date: Fri Jan 23 17:38:04 1998
• Orig file: v2.1.80/linux/drivers/char/videodev.c
• Orig date: Mon Jan 12 14:46:16 1998

diff -u --recursive --new-file v2.1.80/linux/drivers/char/videodev.c linux/drivers/char/videodev.c
@@ -36,17 +36,15 @@
  
 static struct video_device *video_device[VIDEO_NUM_DEVICES];
 
-/*
- *	Initialiser list
- */
- 
-struct video_init
-{
-	char *name;
-	int (*init)(struct video_init *);
-};
-
+#ifdef CONFIG_VIDEO_BT848
 extern int init_bttv_cards(struct video_init *);
+#endif
+#ifdef CONFIG_VIDEO_CQCAM
+extern int init_colour_qcams(struct video_init *);
+#endif
+#ifdef CONFIG_VIDEO_BWQCAM
+extern int init_bw_qcams(struct video_init *);
+#endif
 
 static struct video_init video_init_list[]={
 #ifdef CONFIG_VIDEO_BT848
@@ -59,7 +57,7 @@
 	{"bw-qcam", init_bw_qcams},
 #endif	
 #ifdef CONFIG_VIDEO_PMS
-	{"PMS", init_pms_cards},
+	{"PMS", init_pms_cards}, 	/* not defined anywhere */
 #endif	
 	{"end", NULL}
 };
@@ -72,7 +70,6 @@
 static ssize_t video_read(struct file *file,
 	char *buf, size_t count, loff_t *ppos)
 {
-	int err;
 	struct video_device *vfl=video_device[MINOR(file->f_dentry->d_inode->i_rdev)];
 	return vfl->read(vfl, buf, count, file->f_flags&O_NONBLOCK);
 }
@@ -85,7 +82,6 @@
 static ssize_t video_write(struct file *file, const char *buf, 
 	size_t count, loff_t *ppos)
 {
-	int err;
 	struct video_device *vfl=video_device[MINOR(file->f_dentry->d_inode->i_rdev)];
 	return vfl->write(vfl, buf, count, file->f_flags&O_NONBLOCK);
 }