summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/v4l2-common.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
commit72f5824b3f52fedf99d70a834d9be2a10ee318c6 (patch)
tree6ff5926046a63813899eea2ae7fc20565d92b051 /linux/drivers/media/video/v4l2-common.c
parent350bbc5926746c35a38095da02fa7e82d67cca22 (diff)
parentddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff)
downloadmediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.gz
mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/v4l2-common.c')
-rw-r--r--linux/drivers/media/video/v4l2-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 1e795e928..a027d9baa 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -64,7 +64,7 @@
#include <linux/kmod.h>
#endif
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include "compat.h"
MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");