diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 05:04:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:07:23 -0400 |
commit | 0f45b8c57e40cca1778b0b75daab65ca139e5bb9 (patch) | |
tree | 42bb3d0a7253e08347f88ac7cd4b0e34f823c779 /include/media | |
parent | 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941 (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/media')
-rw-r--r-- | include/media/ivtv-fb.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/include/media/ivtv-fb.h b/include/media/ivtv-fb.h deleted file mode 100644 index d3a797b17280..000000000000 --- a/include/media/ivtv-fb.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | On Screen Display cx23415 Framebuffer driver | ||
3 | |||
4 | Copyright (C) 2006 Ian Armstrong <ian@iarmst.demon.co.uk> | ||
5 | |||
6 | This program is free software; you can redistribute it and/or modify | ||
7 | it under the terms of the GNU General Public License as published by | ||
8 | the Free Software Foundation; either version 2 of the License, or | ||
9 | (at your option) any later version. | ||
10 | |||
11 | This program is distributed in the hope that it will be useful, | ||
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | GNU General Public License for more details. | ||
15 | |||
16 | You should have received a copy of the GNU General Public License | ||
17 | along with this program; if not, write to the Free Software | ||
18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #ifndef _LINUX_IVTV_FB_H | ||
22 | #define _LINUX_IVTV_FB_H | ||
23 | |||
24 | /* Framebuffer external API */ | ||
25 | |||
26 | struct ivtvfb_dma_frame { | ||
27 | void __user *source; | ||
28 | unsigned long dest_offset; | ||
29 | int count; | ||
30 | }; | ||
31 | |||
32 | #define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) | ||
33 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) | ||
34 | |||
35 | #endif | ||