diff options
author | Grazvydas Ignotas <notasas@gmail.com> | 2010-05-24 17:34:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:09 -0400 |
commit | 49c39b4953e545ce3b5957cce22e1ade01c6e642 (patch) | |
tree | 7ed545609a4abd9cf818d27a08019e0c821f8d48 /include/linux | |
parent | 1f9c3e1f07e39c8af3bf42236fc553b5bb0f83f1 (diff) |
fbdev: move FBIO_WAITFORVSYNC to linux/fb.h
FBIO_WAITFORVSYNC is currently implemented by matroxfb, atyfb, intelfb and
more. All of them keep redefining the same FBIO_WAITFORVSYNC macro over
and over again, so move it to linux/fb.h and clean up those duplicate
defines.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Maik Broemme <mbroemme@plusserver.de>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: "Hiremath, Vaibhav" <hvaibhav@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fb.h | 2 | ||||
-rw-r--r-- | include/linux/ivtvfb.h | 1 | ||||
-rw-r--r-- | include/linux/matroxfb.h | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 1296af45169d..f3793ebc241c 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -37,7 +37,7 @@ struct dentry; | |||
37 | #define FBIOGET_HWCINFO 0x4616 | 37 | #define FBIOGET_HWCINFO 0x4616 |
38 | #define FBIOPUT_MODEINFO 0x4617 | 38 | #define FBIOPUT_MODEINFO 0x4617 |
39 | #define FBIOGET_DISPINFO 0x4618 | 39 | #define FBIOGET_DISPINFO 0x4618 |
40 | 40 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | |
41 | 41 | ||
42 | #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ | 42 | #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ |
43 | #define FB_TYPE_PLANES 1 /* Non interleaved planes */ | 43 | #define FB_TYPE_PLANES 1 /* Non interleaved planes */ |
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h index 9d88b29ddf55..e8b92f67f10d 100644 --- a/include/linux/ivtvfb.h +++ b/include/linux/ivtvfb.h | |||
@@ -33,6 +33,5 @@ struct ivtvfb_dma_frame { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | #define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) | 35 | #define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) |
36 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
37 | 36 | ||
38 | #endif | 37 | #endif |
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h index 2203121a43e9..8c22a8938642 100644 --- a/include/linux/matroxfb.h +++ b/include/linux/matroxfb.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <asm/ioctl.h> | 4 | #include <asm/ioctl.h> |
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/videodev2.h> | 6 | #include <linux/videodev2.h> |
7 | #include <linux/fb.h> | ||
7 | 8 | ||
8 | struct matroxioc_output_mode { | 9 | struct matroxioc_output_mode { |
9 | __u32 output; /* which output */ | 10 | __u32 output; /* which output */ |
@@ -37,7 +38,5 @@ enum matroxfb_ctrl_id { | |||
37 | MATROXFB_CID_LAST | 38 | MATROXFB_CID_LAST |
38 | }; | 39 | }; |
39 | 40 | ||
40 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
41 | |||
42 | #endif | 41 | #endif |
43 | 42 | ||