Merge branch 'x86/oprofile' into oprofile

[linux-2.6-omap-h63xx.git] / drivers / media / video / uvc / uvc_v4l2.c

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 2e0a66575bb4af709da78f4f4071b4408a755dc6..d7bd71be40a9d8f76afd3a71c12b5025c714867d 100644 (file)
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -23,6 +23,7 @@
 #include <asm/atomic.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "uvcvideo.h"
 
@@ -1032,7 +1033,7 @@ static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct video_device *vdev = video_devdata(file);
        struct uvc_video_device *video = video_get_drvdata(vdev);
-       struct uvc_buffer *buffer;
+       struct uvc_buffer *uninitialized_var(buffer);
        struct page *page;
        unsigned long addr, start, size;
        unsigned int i;
@@ -1103,3 +1104,4 @@ struct file_operations uvc_fops = {
        .mmap           = uvc_v4l2_mmap,
        .poll           = uvc_v4l2_poll,
 };
+