Merge tag 'upstream-3.9-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / drivers / staging / imx-drm / Makefile

diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
index c8f582e025654e0b641c59730401c091973b40af..83a9056546e6f2c764f4f7b5761e91c8fb59c9cf 100644 (file)
--- a/drivers/staging/imx-drm/Makefile
+++ b/drivers/staging/imx-drm/Makefile
@@ -5,3 +5,5 @@ obj-$(CONFIG_DRM_IMX) += imxdrm.o
 
 obj-$(CONFIG_DRM_IMX_PARALLEL_DISPLAY) += parallel-display.o
 obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
+obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
+obj-$(CONFIG_DRM_IMX_IPUV3)    += ipuv3-crtc.o