aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 12:14:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 12:14:55 -0700
commitebdcc81c71937b30e09110c02a1e8a21fa770b6f (patch)
tree2bf49d0dfe182ca7dd887c013eb04af9820b191f
parent01f675029dfdcbd83b451bff4138de0d43752c4a (diff)
parent260cf8a2cbe022131a4850ea6175ed716dc2663c (diff)
downloadlinux-2.6.34-ux500-ebdcc81c71937b30e09110c02a1e8a21fa770b6f.tar.gz
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 ff8d27af478..a11cc9d3259 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;