Merge drm/drm-next into drm-intel-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / Makefile

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index d6ac946..e245a03 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -200,14 +200,17 @@ i915-y += \
        display/intel_color.o \
        display/intel_combo_phy.o \
        display/intel_connector.o \
+       display/intel_crtc.o \
        display/intel_csr.o \
        display/intel_cursor.o \
        display/intel_display.o \
        display/intel_display_power.o \
        display/intel_dpio_phy.o \
+       display/intel_dpll.o \
        display/intel_dpll_mgr.o \
        display/intel_dsb.o \
        display/intel_fbc.o \
+       display/intel_fdi.o \
        display/intel_fifo_underrun.o \
        display/intel_frontbuffer.o \
        display/intel_global_state.o \
@@ -252,6 +255,7 @@ i915-y += \
        display/intel_lspcon.o \
        display/intel_lvds.o \
        display/intel_panel.o \
+       display/intel_pps.o \
        display/intel_sdvo.o \
        display/intel_tv.o \
        display/intel_vdsc.o \