patch-2.4.0-test11 linux/drivers/media/video/zr36120.c

• Lines: 69
• Date: Fri Nov 17 17:56:52 2000
• Orig file: v2.4.0-test10/linux/drivers/media/video/zr36120.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/video/zr36120.c linux/drivers/media/video/zr36120.c
@@ -1482,23 +1482,17 @@
 
 static struct video_device zr36120_template=
 {
-	"UNSET",
-	VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY,
-	VID_HARDWARE_ZR36120,
-
-	zoran_open,
-	zoran_close,
-	zoran_read,
-	zoran_write,
-#if LINUX_VERSION_CODE >= 0x020100
-	zoran_poll,		/* poll */
-#endif
-	zoran_ioctl,
-	zoran_mmap,
-	NULL,			/* initialize */
-	NULL,
-	0,
-	-1
+	name:		"UNSET",
+	type:		VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY,
+	hardware:	VID_HARDWARE_ZR36120,
+	open:		zoran_open,
+	close:		zoran_close,
+	read:		zoran_read,
+	write:		zoran_write,
+	poll:		zoran_poll,
+	ioctl:		zoran_ioctl,
+	mmap:		zoran_mmap,
+	minor:		-1,
 };
 
 static
@@ -1825,23 +1819,16 @@
 
 static struct video_device vbi_template=
 {
-	"UNSET",
-	VID_TYPE_CAPTURE|VID_TYPE_TELETEXT,
-	VID_HARDWARE_ZR36120,
-
-	vbi_open,
-	vbi_close,
-	vbi_read,
-	zoran_write,
-#if LINUX_VERSION_CODE >= 0x020100
-	vbi_poll,		/* poll */
-#endif
-	vbi_ioctl,
-	NULL,			/* no mmap */
-	NULL,			/* no initialize */
-	NULL,			/* priv */
-	0,			/* busy */
-	-1			/* minor */
+	name:		"UNSET",
+	type:		VID_TYPE_CAPTURE|VID_TYPE_TELETEXT,
+	hardware:	VID_HARDWARE_ZR36120,
+	open:		vbi_open,
+	close:		vbi_close,
+	read:		vbi_read,
+	write:		zoran_write,
+	poll:		vbi_poll,
+	ioctl:		vbi_ioctl,
+	minor:		-1,
 };
 
 /*