From b4af1d777c2ef397ff15f41833124e9d801a82c4 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 20 Nov 2012 13:32:30 -0200 Subject: [PATCH] --- yaml --- r: 345509 b: refs/heads/master c: 70b12bb415463c1bd146b67c5fbf6784fd046ad9 h: refs/heads/master i: 345507: d919c1a6858387f0c54a4c661e2fea1f8e2d8631 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 55ad5be1ac76..9f07e3d2dd6e 100644 --- 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 index d5d8f2f2ed09..6745c7f976db 100644 --- 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;