aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-26 06:04:10 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:07:23 -0300
commit0f45b8c57e40cca1778b0b75daab65ca139e5bb9 (patch)
tree42bb3d0a7253e08347f88ac7cd4b0e34f823c779 /include
parent66cfaeff95d20d1377b4fa3d2c6aa7c29d832941 (diff)
V4L/DVB (6119): ivtvfb: renamed ivtv-fb to ivtvfb, move header to include/linux
The convention for framebuffer devices is to call them xxxfb, not xxx-fb. Conform to this. Also move the ivtvfb.h header to include/linux: it is a public header. The FBIO_WAITFORVSYNC ioctl is now also defined in the ivtvfb.h header, no more need to include matroxfb.h for just this ioctl. 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/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 d3a797b1728..e980ba62ddc 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