From 3682f3f70124e5d58adf5c63a6db595ba181b77f Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 12 Aug 2006 18:54:55 +0200 Subject: [GCC4] fix build error in drivers/media/video/videodev.c This patch fixes this error : videodev.c:636: error: static declaration of 'video_fops' follows non-static declaration videodev.c:492: error: previous declaration of 'video_fops' was here make[4]: *** [videodev.o] Error 1 make[4]: Leaving directory `/usr/src/git/linux-2.4/drivers/media/video' make[3]: *** [first_rule] Error 2 make[3]: Leaving directory `/usr/src/git/linux-2.4/drivers/media/video' make[2]: *** [_subdir_video] Error 2 make[2]: Leaving directory `/usr/src/git/linux-2.4/drivers/media' make[1]: *** [_subdir_media] Error 2 make[1]: Leaving directory `/usr/src/git/linux-2.4/drivers' make: *** [_dir_drivers] Error 2 --- drivers/media/video/videodev.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 9621a90..42b6f54 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -489,7 +489,18 @@ static void videodev_proc_destroy_dev (s #endif /* CONFIG_VIDEO_PROC_FS */ -extern struct file_operations video_fops; +static struct file_operations video_fops= +{ + owner: THIS_MODULE, + llseek: no_llseek, + read: video_read, + write: video_write, + ioctl: video_ioctl, + mmap: video_mmap, + open: video_open, + release: video_release, + poll: video_poll, +}; /** * video_register_device - register video4linux devices @@ -633,19 +644,6 @@ #endif } -static struct file_operations video_fops= -{ - owner: THIS_MODULE, - llseek: no_llseek, - read: video_read, - write: video_write, - ioctl: video_ioctl, - mmap: video_mmap, - open: video_open, - release: video_release, - poll: video_poll, -}; - /* * Initialise video for linux */ -- 1.4.2