aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/ivtv/ivtv-fb.c3
-rw-r--r--include/media/ivtv-fb.h3
2 files changed, 3 insertions, 3 deletions
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