summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 20:14:55 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 20:14:55 +0100
commitebdcc81c71937b30e09110c02a1e8a21fa770b6f (patch)
tree2bf49d0dfe182ca7dd887c013eb04af9820b191f
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parentdrm: fix EDID parser problem with positive/negative hsync/vsync (diff)
downloadlinux-ebdcc81c71937b30e09110c02a1e8a21fa770b6f.tar.xz
linux-ebdcc81c71937b30e09110c02a1e8a21fa770b6f.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix EDID parser problem with positive/negative hsync/vsync
-rw-r--r--include/drm/drm_edid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index ff8d27af4786..a11cc9d32591 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -69,8 +69,8 @@ struct detailed_pixel_timing {
u8 hborder;
u8 vborder;
u8 unknown0:1;
- u8 vsync_positive:1;
u8 hsync_positive:1;
+ u8 vsync_positive:1;
u8 separate_sync:2;
u8 stereo:1;
u8 unknown6:1;