Merge tag 'v3.14-rc6' into drm-intel-next-queued

[mirror_ubuntu-zesty-kernel.git] / drivers / gpu / drm / i915 / Makefile

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 077e81b1065dd0d98254aa850c205f57c969b81f..b1445b73465be0642aa0904df983183f0ae42135 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -36,11 +36,10 @@ i915-y += i915_cmd_parser.o \
 i915-y += intel_bios.o \
          intel_display.o \
          intel_modes.o \
-         intel_opregion.o \
          intel_overlay.o \
          intel_sideband.o \
          intel_sprite.o
-i915-$(CONFIG_ACPI)            += intel_acpi.o
+i915-$(CONFIG_ACPI)            += intel_acpi.o intel_opregion.o
 i915-$(CONFIG_DRM_I915_FBDEV)  += intel_fbdev.o
 
 # modesetting output/encoder code