Commit 0a40a55f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0f181328 f29ce727

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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,