Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / drivers / media / video / zr364xx.c

diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 36ba36a5e2ea626f6ddb49de5d9bbdbb1aa19ca6..18d1c4ba79fbf7c8384ba8497320d180ad226b44 100644 (file)
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -780,7 +780,6 @@ static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = {
 
 static struct video_device zr364xx_template = {
        .name = DRIVER_DESC,
-       .type = VID_TYPE_CAPTURE,
        .fops = &zr364xx_fops,
        .ioctl_ops = &zr364xx_ioctl_ops,
        .release = video_device_release,