diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-26 04:45:48 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:07:20 -0400 |
| commit | 66cfaeff95d20d1377b4fa3d2c6aa7c29d832941 (patch) | |
| tree | 4f018861b2903cc0f67b85b746acd22d7b046352 | |
| parent | effa0b08633122cc63d2b7f098434d359d5767ef (diff) | |
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>
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-fb.c | 3 | ||||
| -rw-r--r-- | 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 ffe6478682ae..d2b1f5d5c8b2 100644 --- a/drivers/media/video/ivtv/ivtv-fb.c +++ b/drivers/media/video/ivtv/ivtv-fb.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <linux/console.h> | 47 | #include <linux/console.h> |
| 48 | #include <linux/bitops.h> | 48 | #include <linux/bitops.h> |
| 49 | #include <linux/pagemap.h> | 49 | #include <linux/pagemap.h> |
| 50 | #include <linux/matroxfb.h> | 50 | #include <media/ivtv-fb.h> |
| 51 | 51 | ||
| 52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 53 | #include <asm/ioctl.h> | 53 | #include <asm/ioctl.h> |
| @@ -59,7 +59,6 @@ | |||
| 59 | #include "ivtv-driver.h" | 59 | #include "ivtv-driver.h" |
| 60 | #include "ivtv-udma.h" | 60 | #include "ivtv-udma.h" |
| 61 | #include "ivtv-mailbox.h" | 61 | #include "ivtv-mailbox.h" |
| 62 | #include <media/ivtv-fb.h> | ||
| 63 | 62 | ||
| 64 | /* card parameters */ | 63 | /* card parameters */ |
| 65 | static int ivtv_fb_card_id = -1; | 64 | static int ivtv_fb_card_id = -1; |
diff --git a/include/media/ivtv-fb.h b/include/media/ivtv-fb.h index 3b746f5e3c9e..d3a797b17280 100644 --- a/include/media/ivtv-fb.h +++ b/include/media/ivtv-fb.h | |||
| @@ -29,6 +29,7 @@ struct ivtvfb_dma_frame { | |||
| 29 | int count; | 29 | int count; |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | #define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) | 32 | #define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) |
| 33 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) | ||
| 33 | 34 | ||
| 34 | #endif | 35 | #endif |
