Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / media / video / usbvideo / vicam.c

diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index ff555129c82f2830d45ec0b3a7e9e30fe3d555b3..da1ba0211108939810983cb3753588d713c257ef 100644 (file)
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum)
                request[7] = realShutter >> 8;
        }
 
-       // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0
+       // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0
        request[8] = 0;
        // bytes 9-15 do not seem to affect exposure or image quality
 
@@ -1074,7 +1074,6 @@ static struct video_device vicam_template = {
        .owner          = THIS_MODULE,
        .name           = "ViCam-based USB Camera",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_VICAM,
        .fops           = &vicam_fops,
        .minor          = -1,
 };