diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ivtvfb.h (renamed from include/media/ivtv-fb.h) | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/media/ivtv-fb.h b/include/linux/ivtvfb.h index d3a797b17280..e980ba62ddcc 100644 --- a/include/media/ivtv-fb.h +++ b/include/linux/ivtvfb.h @@ -1,7 +1,7 @@ /* On Screen Display cx23415 Framebuffer driver - Copyright (C) 2006 Ian Armstrong <ian@iarmst.demon.co.uk> + Copyright (C) 2006, 2007 Ian Armstrong <ian@iarmst.demon.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,8 +18,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _LINUX_IVTV_FB_H -#define _LINUX_IVTV_FB_H +#ifndef __LINUX_IVTVFB_H__ +#define __LINUX_IVTVFB_H__ + +#ifdef __KERNEL__ +#include <linux/compiler.h> /* need __user */ +#else +#define __user +#endif +#include <linux/types.h> /* Framebuffer external API */ @@ -29,7 +36,7 @@ struct ivtvfb_dma_frame { int count; }; -#define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) +#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) #define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) #endif |