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

Next file: linux/drivers/char/vt.c
Previous file: linux/drivers/char/vc_screen.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/drivers/char/videodev.c linux/drivers/char/videodev.c
@@ -302,22 +302,16 @@
 
 static struct file_operations video_fops=
 {
-	video_lseek,
-	video_read,
-	video_write,
-	NULL,	/* readdir */
-#if LINUX_VERSION_CODE >= 0x020100
-	video_poll,	/* poll */
-#else
-	NULL,
+	llseek:		video_lseek,
+	read:		video_read,
+	write:		video_write,
+	ioctl:		video_ioctl,
+	mmap:		video_mmap,
+	open:		video_open,
+	release:	video_release,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
+	poll:		video_poll,
 #endif
-	video_ioctl,
-	video_mmap,
-	video_open,
-#if LINUX_VERSION_CODE >= 0x020100
-	NULL,		/* flush */
-#endif
-	video_release
 };
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)