aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
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/media
parentV4L/DVB (6118): ivtv-fb: add missing FBIO_WAITFORVSYNC ioctl define (diff)
downloadlinux-dev-0f45b8c57e40cca1778b0b75daab65ca139e5bb9.tar.xz
linux-dev-0f45b8c57e40cca1778b0b75daab65ca139e5bb9.zip
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.h35
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 @@
-/*
- On Screen Display cx23415 Framebuffer driver
-
- Copyright (C) 2006 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _LINUX_IVTV_FB_H
-#define _LINUX_IVTV_FB_H
-
-/* Framebuffer external API */
-
-struct ivtvfb_dma_frame {
- void __user *source;
- unsigned long dest_offset;
- int count;
-};
-
-#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