diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 11:13:04 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 11:13:04 +0200 |
| commit | 2db901634dc12a5abf91e98cfd829e839bc58cb6 (patch) | |
| tree | 0a1dd0e34c188afd73c94a51b0e8b9f13820a473 | |
| parent | 707608b9f4f9f6511695d7d4a423580896329b6b (diff) | |
| download | mediapointer-dvb-s2-2db901634dc12a5abf91e98cfd829e839bc58cb6.tar.gz mediapointer-dvb-s2-2db901634dc12a5abf91e98cfd829e839bc58cb6.tar.bz2 | |
ivtv: move ivtv.h public header to include/linux.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/ivtv.h (renamed from linux/include/media/ivtv.h) | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 38e52e6a6..592b03fe9 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -65,7 +65,7 @@ #include <media/tuner.h> #include <media/cx2341x.h> -#include <media/ivtv.h> +#include <linux/ivtv.h> #if 0 #define HAVE_XC2028 1 diff --git a/linux/include/media/ivtv.h b/linux/include/linux/ivtv.h index 412b48ea8..794b8daa9 100644 --- a/linux/include/media/ivtv.h +++ b/linux/include/linux/ivtv.h @@ -18,8 +18,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _LINUX_IVTV_H -#define _LINUX_IVTV_H +#ifndef __LINUX_IVTV_H__ +#define __LINUX_IVTV_H__ + +#ifdef __KERNEL__ +#include <linux/compiler.h> /* need __user */ +#else +#define __user +#endif +#include <linux/types.h> /* ivtv knows several distinct output modes: MPEG streaming, YUV streaming, YUV updates through user DMA and the passthrough |