From 365b0fe9aeb1192d5eb1aaad11880efc93e80894 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 26 Aug 2007 05:45:48 -0300
Subject: [PATCH] --- yaml --- r: 65815 b: refs/heads/master c:
 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941 h: refs/heads/master i:   65813:
 02530a93bef6b2a4cbd684edd7cc783d4e5df1af   65811:
 885d317aa78e9950ef468ee5fbaf4bd23854b039   65807:
 964be684df4cd98e0827b16c5b87b76cae239339 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-fb.c | 3 +--
 trunk/include/media/ivtv-fb.h            | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 41b4dd627f1a..1d1fd1fd2da0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: effa0b08633122cc63d2b7f098434d359d5767ef
+refs/heads/master: 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fb.c b/trunk/drivers/media/video/ivtv/ivtv-fb.c
index ffe6478682ae..d2b1f5d5c8b2 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fb.c
+++ b/trunk/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/trunk/include/media/ivtv-fb.h b/trunk/include/media/ivtv-fb.h
index 3b746f5e3c9e..d3a797b17280 100644
--- a/trunk/include/media/ivtv-fb.h
+++ b/trunk/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