patch-2.4.0-test11 linux/drivers/media/video/bw-qcam.c

• Lines: 41
• Date: Fri Nov 17 17:56:51 2000
• Orig file: v2.4.0-test10/linux/drivers/media/video/bw-qcam.c
• Orig date: Sat Oct 2 07:35:15 1999

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/video/bw-qcam.c linux/drivers/media/video/bw-qcam.c
@@ -705,11 +705,6 @@
 	MOD_DEC_USE_COUNT;
 }
 
-static int qcam_init_done(struct video_device *dev)
-{
-	return 0;
-}
-
 static long qcam_write(struct video_device *v, const char *buf, unsigned long count, int noblock)
 {
 	return -EINVAL;
@@ -926,20 +921,14 @@
  
 static struct video_device qcam_template=
 {
-	"Connectix Quickcam",
-	VID_TYPE_CAPTURE,
-	VID_HARDWARE_QCAM_BW,
-	qcam_open,
-	qcam_close,
-	qcam_read,
-	qcam_write,
-	NULL,
-	qcam_ioctl,
-	NULL,
-	qcam_init_done,
-	NULL,
-	0,
-	0
+	name:		"Connectix Quickcam",
+	type:		VID_TYPE_CAPTURE,
+	hardware:	VID_HARDWARE_QCAM_BW,
+	open:		qcam_open,
+	close:		qcam_close,
+	read:		qcam_read,
+	write:		qcam_write,
+	ioctl:		qcam_ioctl,
 };
 
 #define MAX_CAMS 4