Title: [9064] trunk/include/linux: fb: merge version of FBIO_WAITFORVSYNC merged upstream
- Revision
- 9064
- Author
- vapier
- Date
- 2010-08-07 03:09:33 -0400 (Sat, 07 Aug 2010)
Log Message
fb: merge version of FBIO_WAITFORVSYNC merged upstream
Modified Paths
Diff
Modified: trunk/include/linux/fb.h (9063 => 9064)
--- trunk/include/linux/fb.h 2010-08-07 07:05:18 UTC (rev 9063)
+++ trunk/include/linux/fb.h 2010-08-07 07:09:33 UTC (rev 9064)
@@ -37,9 +37,8 @@
#define FBIOGET_HWCINFO 0x4616
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
#define FB_TYPE_INTERLEAVED_PLANES 2 /* Interleaved planes */
Modified: trunk/include/linux/matroxfb.h (9063 => 9064)
--- trunk/include/linux/matroxfb.h 2010-08-07 07:05:18 UTC (rev 9063)
+++ trunk/include/linux/matroxfb.h 2010-08-07 07:09:33 UTC (rev 9064)
@@ -4,6 +4,7 @@
#include <asm/ioctl.h>
#include <linux/types.h>
#include <linux/videodev2.h>
+#include <linux/fb.h>
struct matroxioc_output_mode {
__u32 output; /* which output */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
