diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/video/omap2 | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 0d44f070ef36..a981def8099a 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c | |||
| @@ -587,7 +587,7 @@ static void get_edid_timing_data(u8 *edid) | |||
| 587 | struct hdmi_cm cm; | 587 | struct hdmi_cm cm; |
| 588 | struct omap_video_timings edid_timings; | 588 | struct omap_video_timings edid_timings; |
| 589 | 589 | ||
| 590 | /* seach block 0, there are 4 DTDs arranged in priority order */ | 590 | /* search block 0, there are 4 DTDs arranged in priority order */ |
| 591 | for (count = 0; count < EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR; count++) { | 591 | for (count = 0; count < EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR; count++) { |
| 592 | current_descriptor_addrs = | 592 | current_descriptor_addrs = |
| 593 | EDID_DESCRIPTOR_BLOCK0_ADDRESS + | 593 | EDID_DESCRIPTOR_BLOCK0_ADDRESS + |