diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 13:13:04 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 05:07:28 +0400 |
| commit | 51b39dfa5477fdb2459e3c46f855f01b8b03102d (patch) | |
| tree | cf9dc0084a8d364d78c1eaa1786e85e9d8421286 | |
| parent | 136280322d894e6ec07187f2427b00c3d64ad066 (diff) | |
| download | linux-51b39dfa5477fdb2459e3c46f855f01b8b03102d.tar.xz | |
V4L/DVB (6123): ivtv: move ivtv.h public header to include/linux
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 2 | ||||
| -rw-r--r-- | include/linux/ivtv.h (renamed from include/media/ivtv.h) | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 32dfc7a859fa..3bda1df63cb6 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -62,7 +62,7 @@ #include <media/tuner.h> #include <media/cx2341x.h> -#include <media/ivtv.h> +#include <linux/ivtv.h> /* Memory layout */ diff --git a/include/media/ivtv.h b/include/linux/ivtv.h index 412b48ea8eda..794b8daa9378 100644 --- a/include/media/ivtv.h +++ b/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 |