1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d38bb3..e4d971c8b9d0 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,14 @@ menuconfig DRM
           details.  You should also select and configure AGP
           (/dev/agpgart) support.
 
+config DRM_KMS_HELPER
+        tristate
+        depends on DRM
+        select FB
+        select FRAMEBUFFER_CONSOLE if !EMBEDDED
+        help
+          FB and CRTC helpers for KMS drivers.
+
 config DRM_TTM
         tristate
         depends on DRM
@@ -36,6 +44,7 @@ config DRM_TDFX
 config DRM_R128
         tristate "ATI Rage 128"
         depends on DRM && PCI
+        select FW_LOADER
         help
           Choose this option if you have an ATI Rage 128 graphics card.  If M
           is selected, the module will be called r128.  AGP support for
@@ -47,8 +56,9 @@ config DRM_RADEON
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB
-        select FRAMEBUFFER_CONSOLE if !EMBEDDED
+        select FW_LOADER
+        select DRM_KMS_HELPER
+        select DRM_TTM
         help
           Choose this option if you have an ATI Radeon graphics card.  There
           are both PCI and AGP versions.  You don't need to choose this to
@@ -82,11 +92,10 @@ config DRM_I830
 config DRM_I915
         tristate "i915 driver"
         depends on AGP_INTEL
+        select DRM_KMS_HELPER
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        select FB
-        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
@@ -116,6 +125,7 @@ endchoice
 config DRM_MGA
         tristate "Matrox g200/g400"
         depends on DRM
+        select FW_LOADER
         help
           Choose this option if you have a Matrox G200, G400 or G450 graphics
           card.  If M is selected, the module will be called mga.  AGP