drm: backmerge tag 'v3.17-rc5' into drm-next

[uclinux-h8/linux.git] / drivers / video / fbdev / Kconfig

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e911b9c..ccbe2ae 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig FB
        tristate "Support for frame buffer devices"
+       select FB_CMDLINE
        ---help---
          The frame buffer device provides an abstraction for the graphics
          hardware. It represents the frame buffer of some video hardware and
@@ -52,6 +53,9 @@ config FIRMWARE_EDID
         combination with certain motherboards and monitors are known to
         suffer from this problem.
 
+config FB_CMDLINE
+       bool
+
 config FB_DDC
        tristate
        depends on FB