diff options
| -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 32dfc7a859f..3bda1df63cb 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 412b48ea8ed..794b8daa937 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 |