---

yaml --- r: 293835 b: refs/heads/master c: c3dfefa h: refs/heads/master i: 293833: 2bc0948 293831: 4bf9c77 v: v3
git-mirror · Feb 29, 2012 · e3b1209 · e3b1209
1 parent 11d5efe
commit e3b1209
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6f808c8e1c4a3b7e3e0a6cb81541ec615aeb5fd
+refs/heads/master: c3dfefa0a6d235bd465309e12f4c56ea16e71111
diff --git 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)
+		if (bus->has_gpio && IS_GEN2(dev))
 			bus->force_bit = true;
 	}