From ed9c6d1853b93072bcf8f0edebea602bc662c8ac Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 23 Sep 2011 13:18:40 -0400 Subject: [PATCH] --- yaml --- r: 293855 b: refs/heads/master c: 5466c7b1683a23dbbcfb7ee4a71c4f23886001c7 h: refs/heads/master i: 293853: b0dcb8623999b1c213239ded8d3dec8a81aa4b83 293851: 72b7c5b0f3f41232d168c65480031b37893ced62 293847: 7df54f9e969884bf8f1a16f6e6402bd4d314c1d3 293839: b5373291e8a79d262dfe26b304901a15dc06417a 293823: 8accda1f5303d203919b0cbbdf0ea82ed0455c18 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_modes.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae3b3b49f565..8ffc0a5f45c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 370a53f943c2efa08d1e145454571eccaecdcc19 +refs/heads/master: 5466c7b1683a23dbbcfb7ee4a71c4f23886001c7 diff --git a/trunk/drivers/gpu/drm/i915/intel_modes.c b/trunk/drivers/gpu/drm/i915/intel_modes.c index 2978a3f61b58..d1928e79d9b6 100644 --- a/trunk/drivers/gpu/drm/i915/intel_modes.c +++ b/trunk/drivers/gpu/drm/i915/intel_modes.c @@ -28,6 +28,7 @@ #include #include #include "drmP.h" +#include "drm_edid.h" #include "intel_drv.h" #include "i915_drv.h" @@ -42,13 +43,13 @@ bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus) u8 buf[2]; struct i2c_msg msgs[] = { { - .addr = 0x50, + .addr = DDC_ADDR, .flags = 0, .len = 1, .buf = out_buf, }, { - .addr = 0x50, + .addr = DDC_ADDR, .flags = I2C_M_RD, .len = 1, .buf = buf,