summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/w9966.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
commit72f5824b3f52fedf99d70a834d9be2a10ee318c6 (patch)
tree6ff5926046a63813899eea2ae7fc20565d92b051 /linux/drivers/media/video/w9966.c
parent350bbc5926746c35a38095da02fa7e82d67cca22 (diff)
parentddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff)
downloadmediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.gz
mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/w9966.c')
-rw-r--r--linux/drivers/media/video/w9966.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/w9966.c b/linux/drivers/media/video/w9966.c
index 66c730b8b..964c28c8a 100644
--- a/linux/drivers/media/video/w9966.c
+++ b/linux/drivers/media/video/w9966.c
@@ -58,7 +58,7 @@
#include <linux/init.h>
#include <linux/delay.h>
#include "compat.h"
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <linux/parport.h>
@@ -197,7 +197,6 @@ static const struct file_operations w9966_fops = {
.llseek = no_llseek,
};
static struct video_device w9966_template = {
- .owner = THIS_MODULE,
.name = W9966_DRIVERNAME,
.type = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
.fops = &w9966_fops,