Diff
Modified: trunk/drivers/video/aty/atyfb_base.c (8961 => 8962)
--- trunk/drivers/video/aty/atyfb_base.c 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/drivers/video/aty/atyfb_base.c 2010-07-02 20:35:50 UTC (rev 8962)
@@ -1820,10 +1820,6 @@
#define ATYIO_FEATW 0x41545903 /* ATY\03 */
#endif
-#ifndef FBIO_WAITFORVSYNC
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-#endif
-
static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
{
struct atyfb_par *par = (struct atyfb_par *) info->par;
Modified: trunk/drivers/video/intelfb/intelfb.h (8961 => 8962)
--- trunk/drivers/video/intelfb/intelfb.h 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/drivers/video/intelfb/intelfb.h 2010-07-02 20:35:50 UTC (rev 8962)
@@ -371,10 +371,6 @@
((dinfo)->chipset == INTEL_965G) || \
((dinfo)->chipset == INTEL_965GM))
-#ifndef FBIO_WAITFORVSYNC
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-#endif
-
/*** function prototypes ***/
extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var);
Modified: trunk/include/linux/fb.h (8961 => 8962)
--- trunk/include/linux/fb.h 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/include/linux/fb.h 2010-07-02 20:35:50 UTC (rev 8962)
@@ -37,6 +37,7 @@
#define FBIOGET_HWCINFO 0x4616
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
Modified: trunk/include/linux/ivtvfb.h (8961 => 8962)
--- trunk/include/linux/ivtvfb.h 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/include/linux/ivtvfb.h 2010-07-02 20:35:50 UTC (rev 8962)
@@ -33,6 +33,5 @@
};
#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#endif
Modified: trunk/include/linux/matroxfb.h (8961 => 8962)
--- trunk/include/linux/matroxfb.h 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/include/linux/matroxfb.h 2010-07-02 20:35:50 UTC (rev 8962)
@@ -37,7 +37,5 @@
MATROXFB_CID_LAST
};
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-
#endif
Modified: trunk/include/video/sh_mobile_lcdc.h (8961 => 8962)
--- trunk/include/video/sh_mobile_lcdc.h 2010-07-01 14:34:10 UTC (rev 8961)
+++ trunk/include/video/sh_mobile_lcdc.h 2010-07-02 20:35:50 UTC (rev 8962)
@@ -34,8 +34,6 @@
#define LCDC_FLAGS_HSCNT (1 << 3) /* Disable HSYNC during VBLANK */
#define LCDC_FLAGS_DWCNT (1 << 4) /* Disable dotclock during blanking */
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-
struct sh_mobile_lcdc_sys_bus_cfg {
unsigned long ldmt2r;
unsigned long ldmt3r;
