From 0808ee6833a9bdc49cb2c16afbda5c04cc474f6d Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 4 Jun 2011 19:34:56 +0000 Subject: [PATCH] --- yaml --- r: 253723 b: refs/heads/master c: 826c7e4147f902737b281e8a5a7d7aa33fd63316 h: refs/heads/master i: 253721: 825e9cc873f6ef3652b97a8f1067c49c9724bba4 253719: 4bb8047ea8b97b32ae4472e709a114ef9e1fcdfd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc8707db96c8..1571d56882e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cafe8d8413399119c3f4cd575e0eb27e2654b9d5 +refs/heads/master: 826c7e4147f902737b281e8a5a7d7aa33fd63316 diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c index d3b903bce7c5..d98cee60b602 100644 --- a/trunk/drivers/gpu/drm/i915/intel_i2c.c +++ b/trunk/drivers/gpu/drm/i915/intel_i2c.c @@ -401,8 +401,7 @@ int intel_setup_gmbus(struct drm_device *dev) bus->reg0 = i | GMBUS_RATE_100KHZ; /* XXX force bit banging until GMBUS is fully debugged */ - if (IS_GEN2(dev)) - bus->force_bit = intel_gpio_create(dev_priv, i); + bus->force_bit = intel_gpio_create(dev_priv, i); } intel_i2c_reset(dev_priv->dev);