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 7e96d74242f35daf1df85942c319f742a2ecd289..3c8827a7aabd35a962a16cdcd245f2be03c7608b 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -15,9 +15,9 @@ drm-y       :=        drm_auth.o drm_bufs.o drm_cache.o \
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
-drm_helper-y := drm_fb_helper.o drm_crtc_helper.o
+drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o
 
-obj-$(CONFIG_DRM_MODE_HELPER) += drm_helper.o
+obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
 
 obj-$(CONFIG_DRM)      += drm.o
 obj-$(CONFIG_DRM_TTM)  += ttm/