Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / omap24xxcam.c

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index dfd34796d0493345101b385e065c3e978d842a01..6793869fcf58599cf15c62e533818b0e23ec9808 100644 (file)
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -37,6 +37,7 @@
 #include <linux/io.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "omap24xxcam.h"
 
@@ -1559,7 +1560,6 @@ static int omap24xxcam_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations omap24xxcam_fops = {
-       .owner   = THIS_MODULE,
        .llseek  = no_llseek,
        .ioctl   = video_ioctl2,
        .poll    = omap24xxcam_poll,