Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6: drm/i915: automatically select FRAMEBUFFER_CONSOLE if !EMBEDDED

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6: drm/i915: automatically select FRAMEBUFFER_CONSOLE if !EMBEDDED
0a40a55f · Linus Torvalds · 0f181328 · f29ce727 · 0a40a55f
Commit 0a40a55f authored May 13, 2009 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/gpu/drm/Kconfig drivers/gpu/drm/Kconfig +1 -0

No files found.
--- 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,