Merge branches 'release', 'bugzilla-13032', 'bugzilla-13041+', 'bugzilla-13121',...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / Kconfig

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index f33d2527991262115fd287e5b0e0440fb7fa5552..4cd35d8fd799a1e75de762954bc34af86e79190b 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -71,6 +71,7 @@ config DRM_I915
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB
+       select FRAMEBUFFER_CONSOLE if !EMBEDDED
        tristate "i915 driver"
        help
          Choose this option if you have a system that has Intel 830M, 845G,