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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
include
/
media
/
v4l2-dev.h
diff --git
a/include/media/v4l2-dev.h
b/include/media/v4l2-dev.h
index
f866532
..
600d61d
100644
(file)
--- a/
include/media/v4l2-dev.h
+++ b/
include/media/v4l2-dev.h
@@
-16,7
+16,7
@@
#include <linux/device.h>
#include <linux/mutex.h>
#include <linux/compiler.h> /* need __user */
-#ifdef CONFIG_VIDEO_V4L1
+#ifdef CONFIG_VIDEO_V4L1
_COMPAT
#include <linux/videodev.h>
#else
#include <linux/videodev2.h>