---

yaml --- r: 65816 b: refs/heads/master c: 0f45b8c h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 1d73890 · 1d73890
1 parent 365b0fe
commit 1d73890
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941
+refs/heads/master: 0f45b8c57e40cca1778b0b75daab65ca139e5bb9
diff --git a/trunk/drivers/media/video/ivtv/Kconfig b/trunk/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/trunk/drivers/media/video/ivtv/Makefile b/trunk/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/trunk/drivers/media/video/ivtv/ivtv-fb.c → trunk/drivers/media/video/ivtv/ivtvfb.c b/trunk/drivers/media/video/ivtv/ivtv-fb.c → trunk/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>

diff --git a/trunk/include/media/ivtv-fb.h → trunk/include/linux/ivtvfb.h b/trunk/include/media/ivtv-fb.h → trunk/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