From 234348bdb3c06955063f80be55706db2ccc0bf50 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 9 Apr 2012 21:10:38 +0200 Subject: [PATCH] --- yaml --- r: 298995 b: refs/heads/master c: 6a562e3daee217ce99fe0e31150acd89a5b22606 h: refs/heads/master i: 298993: 32de867d19659c2c0221cc2076747eddf8e1e6db 298991: 1356346d942dccdab46ab0a3d50f39af84b4ffad v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b770c195acea..6ac03f12e11c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4867936474183332db4c19791a65fdad6474fd5 +refs/heads/master: 6a562e3daee217ce99fe0e31150acd89a5b22606 diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c index 601c86e664af..8fdc95700218 100644 --- a/trunk/drivers/gpu/drm/i915/intel_i2c.c +++ b/trunk/drivers/gpu/drm/i915/intel_i2c.c @@ -390,7 +390,7 @@ int intel_setup_gmbus(struct drm_device *dev) bus->has_gpio = intel_gpio_setup(bus, i); /* XXX force bit banging until GMBUS is fully debugged */ - if (bus->has_gpio && IS_GEN2(dev)) + if (bus->has_gpio) bus->force_bit = true; }