4 files changed, 11 insertions, 7 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 8c7309177c08..d42cf54f7804 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,12 +18,13 @@ menuconfig DRM
           details.  You should also select and configure AGP
           (/dev/agpgart) support.
 
-config DRM_MODE_HELPER
+config DRM_KMS_HELPER
         tristate
         depends on DRM
         select FB
+        select FRAMEBUFFER_CONSOLE if !EMBEDDED
         help
-          FB and CRTC helpers for kms drivers.
+          FB and CRTC helpers for KMS drivers.
 
 config DRM_TTM
         tristate
@@ -90,11 +91,10 @@ config DRM_I830
 config DRM_I915
         tristate "i915 driver"
         depends on AGP_INTEL
-        select DRM_MODE_HELPER
+        select DRM_KMS_HELPER
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FRAMEBUFFER_CONSOLE if !EMBEDDED
         # i915 depends on ACPI_VIDEO when ACPI is enabled
         # but for select to work, need to select ACPI_VIDEO's dependencies, ick
         select VIDEO_OUTPUT_CONTROL if ACPI
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 7e96d74242f3..3c8827a7aabd 100644
--- 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/
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 41086e98059e..8eee4a620376 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -34,6 +34,10 @@
 #include "drm_fb_helper.h"
 #include "drm_crtc_helper.h"
 
+MODULE_AUTHOR("David Airlie, Jesse Barnes");
+MODULE_DESCRIPTION("DRM KMS helper");
+MODULE_LICENSE("GPL and additional rights");
+
 static LIST_HEAD(kernel_fb_helper_list);
 
 bool drm_fb_helper_force_kernel_mode(void)
diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index fdd9c8949922..3cc89b271123 100644
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -1,7 +1,7 @@
 config DRM_RADEON_KMS
         bool "Enable modesetting on radeon by default"
         depends on DRM_RADEON
-        select DRM_MODE_HELPER
+        select DRM_KMS_HELPER
         select DRM_TTM
         help
           Choose this option if you want kernel modesetting enabled by default,