Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / gma500 / Makefile

diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index d4a87c0..c729868 100644 (file)
--- a/drivers/staging/gma500/Makefile
+++ b/drivers/staging/gma500/Makefile
@@ -10,12 +10,12 @@ psb_gfx-y += gem_glue.o \
          gem.o \
          gtt.o \
          intel_bios.o \
+         intel_i2c.o \
          intel_opregion.o \
          mmu.o \
          power.o \
          psb_drv.o \
          psb_intel_display.o \
-         psb_intel_i2c.o \
          psb_intel_lvds.o \
          psb_intel_modes.o \
          psb_intel_sdvo.o \
@@ -24,11 +24,17 @@ psb_gfx-y += gem_glue.o \
          psb_device.o \
          mid_bios.o
 
-psb_gfx-$(CONFIG_DRM_PSB_CDV) +=  cdv_device.o
+psb_gfx-$(CONFIG_DRM_PSB_CDV) +=  cdv_device.o \
+         cdv_intel_crt.o \
+         cdv_intel_display.o \
+         cdv_intel_hdmi.o \
+         cdv_intel_lvds.o
 
 psb_gfx-$(CONFIG_DRM_PSB_MRST) += mrst_device.o \
          mrst_crtc.o \
-         mrst_lvds.o
+         mrst_lvds.o \
+         mrst_hdmi.o \
+         mrst_hdmi_i2c.o
 
 psb_gfx-$(CONFIG_DRM_PSB_MFLD) += mdfld_device.o \
          mdfld_output.o \
@@ -40,6 +46,7 @@ psb_gfx-$(CONFIG_DRM_PSB_MFLD) += mdfld_device.o \
          mdfld_dsi_dpi.o \
          mdfld_dsi_output.o \
          mdfld_dsi_dbi.o \
+         mdfld_dsi_dbi_dpu.o \
          mdfld_intel_display.o
 
 obj-$(CONFIG_DRM_PSB) += psb_gfx.o