From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 26 Aug 2007 08:45:48 +0000 (-0300)
Subject: V4L/DVB (6118): ivtv-fb: add missing FBIO_WAITFORVSYNC ioctl define
X-Git-Tag: v2.6.24-rc1~1463^2~153
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=66cfaeff95d20d1377b4fa3d2c6aa7c29d832941;p=linux-2.6-omap-h63xx.git

V4L/DVB (6118): ivtv-fb: add missing FBIO_WAITFORVSYNC ioctl define

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/ivtv/ivtv-fb.c b/drivers/media/video/ivtv/ivtv-fb.c
index ffe6478682a..d2b1f5d5c8b 100644
--- a/drivers/media/video/ivtv/ivtv-fb.c
+++ b/drivers/media/video/ivtv/ivtv-fb.c
@@ -47,7 +47,7 @@
 #include <linux/console.h>
 #include <linux/bitops.h>
 #include <linux/pagemap.h>
-#include <linux/matroxfb.h>
+#include <media/ivtv-fb.h>
 
 #include <asm/io.h>
 #include <asm/ioctl.h>
@@ -59,7 +59,6 @@
 #include "ivtv-driver.h"
 #include "ivtv-udma.h"
 #include "ivtv-mailbox.h"
-#include <media/ivtv-fb.h>
 
 /* card parameters */
 static int ivtv_fb_card_id = -1;
diff --git a/include/media/ivtv-fb.h b/include/media/ivtv-fb.h
index 3b746f5e3c9..d3a797b1728 100644
--- a/include/media/ivtv-fb.h
+++ b/include/media/ivtv-fb.h
@@ -29,6 +29,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