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

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

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 9ff5403483e5bd1f1b16192895986f2dae5da7ea..b1d09d8e2b8572c35c88be39100cf35dbc7e21ba 100644 (file)
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -47,6 +47,7 @@
 #include <linux/mutex.h>
 #include <linux/videodev2.h>
 #include <linux/version.h>
+#include <linux/mm.h>
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
@@ -1704,7 +1705,6 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = {
 
 static struct video_device template = {
        .name = "s2255v",
-       .type = VID_TYPE_CAPTURE,
        .fops = &s2255_fops_v4l,
        .ioctl_ops = &s2255_ioctl_ops,
        .minor = -1,