---

yaml --- r: 293855 b: refs/heads/master c: 5466c7b h: refs/heads/master i: 293853: b0dcb86 293851: 72b7c5b 293847: 7df54f9 293839: b537329 293823: 8accda1 v: v3
git-mirror · Mar 21, 2012 · ed9c6d1 · ed9c6d1
1 parent f49d880
commit ed9c6d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -28,6 +28,7 @@
 #include <linux/fb.h>
 #include <drm/drm_edid.h>
 #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,