Merge tag 'drm-intel-next-2014-02-07' of ssh://git.freedesktop.org/git/drm-intel...

[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 4850494bd548ffc50e7c3ec838fc0e926d2edac3..f33902ff2c229e70011012a83f085c39fd5a98e0 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
          intel_ringbuffer.o \
          intel_overlay.o \
          intel_sprite.o \
-         intel_opregion.o \
          intel_sideband.o \
          intel_uncore.o \
          dvo_ch7xxx.o \
@@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
 
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
-i915-$(CONFIG_ACPI)    += intel_acpi.o
+i915-$(CONFIG_ACPI)    += intel_acpi.o intel_opregion.o
 
 i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o