Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / et61x251 / et61x251_core.c

diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index bb164099ea2c866a4a250664dbd7f06ddf48767c..a982750dcef10ad0d73f36be93246c4e1051a80b 100644 (file)
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -1610,6 +1610,7 @@ et61x251_vidioc_enuminput(struct et61x251_device* cam, void __user * arg)
        memset(&i, 0, sizeof(i));
        strcpy(i.name, "Camera");
        i.type = V4L2_INPUT_TYPE_CAMERA;
+       i.capabilities = V4L2_IN_CAP_STD;
 
        if (copy_to_user(arg, &i, sizeof(i)))
                return -EFAULT;