git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.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
7afb97b
..
ea71d5f
100644
(file)
--- a/
drivers/media/video/uvc/uvc_v4l2.c
+++ b/
drivers/media/video/uvc/uvc_v4l2.c
@@
-21,7
+21,7
@@
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/wait.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>