commit ebdcc81c71937b30e09110c02a1e8a21fa770b6f
author Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 11 12:14:55 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 11 12:14:55 2009 -0700
tree 2bf49d0dfe182ca7dd887c013eb04af9820b191f
parent 01f675029dfdcbd83b451bff4138de0d43752c4a
parent 260cf8a2cbe022131a4850ea6175ed716dc2663c

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

include/drm/drm_edid.h

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index ff8d27a..a11cc9d 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -69,8 +69,8 @@
 	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;