diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 06:04:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 22:07:23 -0300 |
| commit | 0f45b8c57e40cca1778b0b75daab65ca139e5bb9 (patch) | |
| tree | 42bb3d0a7253e08347f88ac7cd4b0e34f823c779 /drivers/media | |
| parent | 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941 (diff) | |
| download | blackbird-op-linux-0f45b8c57e40cca1778b0b75daab65ca139e5bb9.tar.gz blackbird-op-linux-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 'drivers/media')
| -rw-r--r-- | drivers/media/video/ivtv/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/video/ivtv/Makefile | 2 | ||||
| -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 To compile this driver as a module, choose M here: the module will be called ivtv. -config VIDEO_IVTV_FB +config VIDEO_FB_IVTV tristate "Conexant cx23415 framebuffer support" depends on VIDEO_IVTV && FB && EXPERIMENTAL 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 \ ivtv-vbi.o ivtv-yuv.o obj-$(CONFIG_VIDEO_IVTV) += ivtv.o -obj-$(CONFIG_VIDEO_IVTV_FB) += ivtv-fb.o +obj-$(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 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/string.h> -#include <linux/mm.h> -#include <linux/tty.h> #include <linux/fb.h> -#include <linux/console.h> -#include <linux/bitops.h> -#include <linux/pagemap.h> -#include <media/ivtv-fb.h> - -#include <asm/io.h> -#include <asm/ioctl.h> +#include <linux/ivtvfb.h> #ifdef CONFIG_MTRR #include <asm/mtrr.h> |
