diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2007-03-20 11:34:40 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2007-03-20 11:34:40 +0800 |
| commit | 0a612e7115ff993bb8e9a00df13c0b0d20122fd6 (patch) | |
| tree | 30cdce5d6cae50261e72cbd26bf81ff0ccda5e21 /src/i830_dvo.c | |
| parent | 8bb677889d3f71cde671f17a3589939acad2c3b3 (diff) | |
| parent | 4c4faf260eb4dad1b1919c6168fa9ef477b98a39 (diff) | |
Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
Conflicts:
src/i830_display.c
Change LVDS output and postread like upstream. This might
need to be retested on 965GM LVDS.
Diffstat (limited to 'src/i830_dvo.c')
| -rw-r--r-- | src/i830_dvo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_dvo.c b/src/i830_dvo.c index 629e9c7d..04750e5d 100644 --- a/src/i830_dvo.c +++ b/src/i830_dvo.c @@ -72,7 +72,7 @@ struct _I830DVODriver i830_dvo_drivers[] = */ /* { I830_DVO_CHIP_LVDS, "ch7017", "ch7017_methods", - (CH7017_ADDR_1 << 1), ch7017_symbols, NULL, NULL, NULL } + 0xea, ch7017_symbols, NULL, NULL, NULL } */ }; |