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 /drivers/video | |
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 'drivers/video')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 29d72851f85b..f8d69ad36830 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -1820,10 +1820,6 @@ struct atyclk { | |||
1820 | #define ATYIO_FEATW 0x41545903 /* ATY\03 */ | 1820 | #define ATYIO_FEATW 0x41545903 /* ATY\03 */ |
1821 | #endif | 1821 | #endif |
1822 | 1822 | ||
1823 | #ifndef FBIO_WAITFORVSYNC | ||
1824 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
1825 | #endif | ||
1826 | |||
1827 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg) | 1823 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg) |
1828 | { | 1824 | { |
1829 | struct atyfb_par *par = (struct atyfb_par *) info->par; | 1825 | struct atyfb_par *par = (struct atyfb_par *) info->par; |
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 40984551c927..6b51175629c7 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -371,10 +371,6 @@ struct intelfb_info { | |||
371 | ((dinfo)->chipset == INTEL_965G) || \ | 371 | ((dinfo)->chipset == INTEL_965G) || \ |
372 | ((dinfo)->chipset == INTEL_965GM)) | 372 | ((dinfo)->chipset == INTEL_965GM)) |
373 | 373 | ||
374 | #ifndef FBIO_WAITFORVSYNC | ||
375 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | ||
376 | #endif | ||
377 | |||
378 | /*** function prototypes ***/ | 374 | /*** function prototypes ***/ |
379 | 375 | ||
380 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); | 376 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); |