Merge ../linux-2.6

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

diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 2374ebc084d4432d17ff47735f6c99c866999809..9edaca4371d7cedb5903d324e531eb4f16469a38 100644 (file)
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4667,7 +4667,6 @@ static const struct file_operations ov511_fops = {
 
 static struct video_device vdev_template = {
        .name =         "OV511 USB Camera",
-       .type =         VID_TYPE_CAPTURE,
        .fops =         &ov511_fops,
        .release =      video_device_release,
        .minor =        -1,