---

yaml --- r: 65815 b: refs/heads/master c: 66cfaef h: refs/heads/master i: 65813: 02530a9 65811: 885d317 65807: 964be68 v: v3
git-mirror · Oct 10, 2007 · 365b0fe · 365b0fe
1 parent 727aaf3
commit 365b0fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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