Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=66cfaeff95d20d1377b4fa3d2c6aa7c29d832941
Commit: 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941
Parent: effa0b08633122cc63d2b7f098434d359d5767ef
Author: Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sun Aug 26 05:45:48 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:07:20 2007 -0300
V4L/DVB (6118): ivtv-fb: add missing FBIO_WAITFORVSYNC ioctl define
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/ivtv/ivtv-fb.c | 3 +--
include/media/ivtv-fb.h | 3 ++-
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 ffe6478..d2b1f5d 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 3b746f5..d3a797b 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
