diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 09:47:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 09:47:41 -0300 |
| commit | 89ddb8a06ccaa14b09c81e81dbacc4ce70285129 (patch) | |
| tree | 98d54c347d5a3771fdb142e3ef8ee0540aa5214c /linux/include | |
| parent | 6413c9eb617e2eebe283211c0422e46bbd7289bb (diff) | |
| parent | 189a39592e02ff2f9a387eff92dfc3a3a2e4ddfb (diff) | |
| download | mediapointer-dvb-s2-89ddb8a06ccaa14b09c81e81dbacc4ce70285129.tar.gz mediapointer-dvb-s2-89ddb8a06ccaa14b09c81e81dbacc4ce70285129.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/ivtv.h | 6 | ||||
| -rw-r--r-- | linux/include/linux/ivtvfb.h | 6 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/linux/include/linux/ivtv.h b/linux/include/linux/ivtv.h index 794b8daa9..17ca64b5a 100644 --- a/linux/include/linux/ivtv.h +++ b/linux/include/linux/ivtv.h @@ -21,11 +21,7 @@ #ifndef __LINUX_IVTV_H__ #define __LINUX_IVTV_H__ -#ifdef __KERNEL__ -#include <linux/compiler.h> /* need __user */ -#else -#define __user -#endif +#include <linux/compiler.h> #include <linux/types.h> /* ivtv knows several distinct output modes: MPEG streaming, diff --git a/linux/include/linux/ivtvfb.h b/linux/include/linux/ivtvfb.h index e980ba62d..e20af47b5 100644 --- a/linux/include/linux/ivtvfb.h +++ b/linux/include/linux/ivtvfb.h @@ -21,11 +21,7 @@ #ifndef __LINUX_IVTVFB_H__ #define __LINUX_IVTVFB_H__ -#ifdef __KERNEL__ -#include <linux/compiler.h> /* need __user */ -#else -#define __user -#endif +#include <linux/compiler.h> #include <linux/types.h> /* Framebuffer external API */ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index f3ae9c88e..a79fc1584 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -55,13 +55,13 @@ */ #ifndef __LINUX_VIDEODEV2_H #define __LINUX_VIDEODEV2_H + #ifdef __KERNEL__ #include <linux/time.h> /* need struct timeval */ -#include <linux/compiler.h> /* need __user */ #else -#define __user #include <sys/time.h> #endif +#include <linux/compiler.h> #include <linux/ioctl.h> #include <linux/types.h> |