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 ffe6478682aef29696c0f9db0b49c1c6e6445cfb..d2b1f5d5c8b2fa4e50b163c7cb4650a6ac23db3c 100644 (file)
--- 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 3b746f5e3c9e58712bd7306b35e4191bcdc5e4ef..d3a797b1728048ea7df29abe97cecb053cda3c08 100644 (file)
--- 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