summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2008-11-25 22:26:38 +0100
committerLaurent Pinchart <laurent.pinchart@skynet.be>2008-11-25 22:26:38 +0100
commit4d8582967a124a215baac71664035b0d6d4a346f (patch)
tree4a16afa4e77eed02a40adc5ee7fb84f456f1e0de /linux/drivers
parenta8b91214d1d10d63bca3f2f9f8d4670f46a0b782 (diff)
downloadmediapointer-dvb-s2-4d8582967a124a215baac71664035b0d6d4a346f.tar.gz
mediapointer-dvb-s2-4d8582967a124a215baac71664035b0d6d4a346f.tar.bz2
uvcvideo: Prevent compat.h from being included in userspace code.
From: Laurent Pinchart <laurent.pinchart@skynet.be> When used in userspace code, the uvcvideo.h header shouldn't pull compat.h. Make sure this won't happen by moving the #include to a __KERNEL__ protected section. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/uvc/uvcvideo.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/uvc/uvcvideo.h b/linux/drivers/media/video/uvc/uvcvideo.h
index f95040380..09b169b69 100644
--- a/linux/drivers/media/video/uvc/uvcvideo.h
+++ b/linux/drivers/media/video/uvc/uvcvideo.h
@@ -4,8 +4,6 @@
#include <linux/kernel.h>
#include <linux/videodev2.h>
-#include "compat.h"
-
/*
* Dynamic controls
*/
@@ -69,6 +67,7 @@ struct uvc_xu_control {
#ifdef __KERNEL__
#include <linux/poll.h>
+#include "compat.h"
/* --------------------------------------------------------------------------
* UVC constants