diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
| commit | bb23e654d39bbfdebbf087f9649d1e0e110c5b20 (patch) | |
| tree | 30898eac94ead8343466ca4714d9871db269595c /linux/include | |
| parent | f876c2dd29df6aadcb5982273b486a95c2e4b193 (diff) | |
| parent | 61d260e2d3239aec8f44c91e3b971621bafbbd45 (diff) | |
| download | mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.gz mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-refactor-phase-1
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 (renamed from linux/include/media/ivtv.h) | 11 |
1 files changed, 9 insertions, 2 deletions
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 |