Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index fdc8e3f..1b07a61 100644 (file)
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -35,7 +35,6 @@
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/vmalloc.h>
@@ -3239,7 +3238,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
                RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
                if (frame->scanstate == STATE_LINES) {
-                       int nextf;
+                       int nextf;
 
                        frame->grabstate = FRAME_DONE;
                        wake_up_interruptible(&frame->wq);
@@ -3405,7 +3404,7 @@ eof:
        RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
        if (frame->scanstate == STATE_LINES) {
-               int nextf;
+               int nextf;
 
                frame->grabstate = FRAME_DONE;
                wake_up_interruptible(&frame->wq);