diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 05:13:04 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:07:28 -0400 |
| commit | 51b39dfa5477fdb2459e3c46f855f01b8b03102d (patch) | |
| tree | cf9dc0084a8d364d78c1eaa1786e85e9d8421286 /include | |
| parent | 136280322d894e6ec07187f2427b00c3d64ad066 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ivtv.h (renamed from include/media/ivtv.h) | 11 |
1 files changed, 9 insertions, 2 deletions
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 @@ | |||
| 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #ifndef _LINUX_IVTV_H | 21 | #ifndef __LINUX_IVTV_H__ |
| 22 | #define _LINUX_IVTV_H | 22 | #define __LINUX_IVTV_H__ |
| 23 | |||
| 24 | #ifdef __KERNEL__ | ||
| 25 | #include <linux/compiler.h> /* need __user */ | ||
| 26 | #else | ||
| 27 | #define __user | ||
| 28 | #endif | ||
| 29 | #include <linux/types.h> | ||
| 23 | 30 | ||
| 24 | /* ivtv knows several distinct output modes: MPEG streaming, | 31 | /* ivtv knows several distinct output modes: MPEG streaming, |
| 25 | YUV streaming, YUV updates through user DMA and the passthrough | 32 | YUV streaming, YUV updates through user DMA and the passthrough |