From 9f62fa0841ba5e9d80a7345f3b6a6cc857007996 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 21 Sep 2010 12:34:25 +0100 Subject: [PATCH] --- yaml --- r: 218084 b: refs/heads/master c: a6b17b4367ed5d9bac94bc87d1489de3847fce98 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dvo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35b49ebc867a..cf42afa29c46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdd59983118c02d9c5ba0c116ded1faef47ec452 +refs/heads/master: a6b17b4367ed5d9bac94bc87d1489de3847fce98 diff --git a/trunk/drivers/gpu/drm/i915/intel_dvo.c b/trunk/drivers/gpu/drm/i915/intel_dvo.c index ad28bc4fb732..561fbc34cec8 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dvo.c +++ b/trunk/drivers/gpu/drm/i915/intel_dvo.c @@ -72,7 +72,7 @@ static const struct intel_dvo_device intel_dvo_devices[] = { .name = "ch7017", .dvo_reg = DVOC, .slave_addr = 0x75, - .gpio = GMBUS_PORT_DPD, + .gpio = GMBUS_PORT_DPB, .dev_ops = &ch7017_ops, } }; @@ -386,7 +386,7 @@ void intel_dvo_init(struct drm_device *dev) else if (dvo->type == INTEL_DVO_CHIP_LVDS) gpio = GMBUS_PORT_PANEL; else - gpio = GMBUS_PORT_DPD; + gpio = GMBUS_PORT_DPB; /* Set up the I2C bus necessary for the chip we're probing. * It appears that everything is on GPIOE except for panels