Merge tag 'rtc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[deliverable/linux.git] / drivers / gpu / drm / omapdrm / Makefile

diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index 778372b062ad68b65e698a5d92eba9cc1b49b442..fe4c2228bc18fca0372184693aa98175c39d7eba 100644 (file)
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -3,6 +3,9 @@
 # Direct Rendering Infrastructure (DRI)
 #
 
+obj-y += dss/
+obj-y += displays/
+
 ccflags-y := -Iinclude/drm -Werror
 omapdrm-y := omap_drv.o \
        omap_irq.o \
@@ -12,10 +15,11 @@ omapdrm-y := omap_drv.o \
        omap_encoder.o \
        omap_connector.o \
        omap_fb.o \
-       omap_fbdev.o \
        omap_gem.o \
        omap_gem_dmabuf.o \
        omap_dmm_tiler.o \
        tcm-sita.o
 
+omapdrm-$(CONFIG_DRM_FBDEV_EMULATION) += omap_fbdev.o
+
 obj-$(CONFIG_DRM_OMAP) += omapdrm.o