aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-26 05:04:10 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:07:23 -0400
commit0f45b8c57e40cca1778b0b75daab65ca139e5bb9 (patch)
tree42bb3d0a7253e08347f88ac7cd4b0e34f823c779 /drivers/media
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 'drivers/media')
-rw-r--r--drivers/media/video/ivtv/Kconfig2
-rw-r--r--drivers/media/video/ivtv/Makefile2
-rw-r--r--drivers/media/video/ivtv/ivtvfb.c (renamed from drivers/media/video/ivtv/ivtv-fb.c)11
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 5efacb332114..7f20c166d59f 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -27,7 +27,7 @@ config VIDEO_IVTV
27 To compile this driver as a module, choose M here: the 27 To compile this driver as a module, choose M here: the
28 module will be called ivtv. 28 module will be called ivtv.
29 29
30config VIDEO_IVTV_FB 30config VIDEO_FB_IVTV
31 tristate "Conexant cx23415 framebuffer support" 31 tristate "Conexant cx23415 framebuffer support"
32 depends on VIDEO_IVTV && FB && EXPERIMENTAL 32 depends on VIDEO_IVTV && FB && EXPERIMENTAL
33 select FB_CFB_FILLRECT 33 select FB_CFB_FILLRECT
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 6998781e2b11..e8eefd96d897 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -5,4 +5,4 @@ ivtv-objs := ivtv-routing.o ivtv-cards.o ivtv-controls.o \
5 ivtv-vbi.o ivtv-yuv.o 5 ivtv-vbi.o ivtv-yuv.o
6 6
7obj-$(CONFIG_VIDEO_IVTV) += ivtv.o 7obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
8obj-$(CONFIG_VIDEO_IVTV_FB) += ivtv-fb.o 8obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
diff --git a/drivers/media/video/ivtv/ivtv-fb.c b/drivers/media/video/ivtv/ivtvfb.c
index d2b1f5d5c8b2..ff721c088479 100644
--- a/drivers/media/video/ivtv/ivtv-fb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -40,17 +40,8 @@
40 40
41#include <linux/module.h> 41#include <linux/module.h>
42#include <linux/kernel.h> 42#include <linux/kernel.h>
43#include <linux/string.h>
44#include <linux/mm.h>
45#include <linux/tty.h>
46#include <linux/fb.h> 43#include <linux/fb.h>
47#include <linux/console.h> 44#include <linux/ivtvfb.h>
48#include <linux/bitops.h>
49#include <linux/pagemap.h>
50#include <media/ivtv-fb.h>
51
52#include <asm/io.h>
53#include <asm/ioctl.h>
54 45
55#ifdef CONFIG_MTRR 46#ifdef CONFIG_MTRR
56#include <asm/mtrr.h> 47#include <asm/mtrr.h>