Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[mirror_ubuntu-zesty-kernel.git] / drivers / gpu / drm / Makefile

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index fe23f29f7cba8bc7fb3e88450b07c2b8537a7913..3c8827a7aabd35a962a16cdcd245f2be03c7608b 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -10,11 +10,15 @@ drm-y       :=      drm_auth.o drm_bufs.o drm_cache.o \
                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
                drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
                drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-               drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
-               drm_info.o drm_debugfs.o
+               drm_crtc.o drm_modes.o drm_edid.o \
+               drm_info.o drm_debugfs.o drm_encoder_slave.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
+
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
+
 obj-$(CONFIG_DRM)      += drm.o
 obj-$(CONFIG_DRM_TTM)  += ttm/
 obj-$(CONFIG_DRM_TDFX) += tdfx/