Merge branch 'bdw-fixes' into backlight-rework

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_opregion.c

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index a0b5a99204a817dd3ecff335a6a76413ad8f95d3..6506df26ac9e2e72ae1a2c10a5965ce0fd177bf4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -859,7 +859,9 @@ int intel_opregion_setup(struct drm_device *dev)
                return -ENOTSUPP;
        }
 
+#ifdef CONFIG_ACPI
        INIT_WORK(&opregion->asle_work, asle_work);
+#endif
 
        base = acpi_os_ioremap(asls, OPREGION_SIZE);
        if (!base)