Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 077e81b1065d..b1445b73465b 100644
--- 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