---

yaml --- r: 345509 b: refs/heads/master c: 70b12bb h: refs/heads/master i: 345507: d919c1a v: v3
git-mirror · Nov 23, 2012 · b4af1d7 · b4af1d7
1 parent 1a65f18
commit b4af1d7
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: 6a9d51b768e2073736ce43164b639ed8da6791ca
+refs/heads/master: 70b12bb415463c1bd146b67c5fbf6784fd046ad9
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -884,7 +884,7 @@ i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct intel_device_info *intel_info =
 		(struct intel_device_info *) ent->driver_data;
 
-	if (intel_info->is_haswell || intel_info->is_valleyview)
+	if (intel_info->is_valleyview)
 		if(!i915_preliminary_hw_support) {
 			DRM_ERROR("Preliminary hardware support disabled\n");
 			return -ENODEV;