aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-13 16:30:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-13 16:30:43 -0700
commit0a40a55fd1fde3875769025ee8a4a7059c7a042d (patch)
treeccbf74a5ba9f76bcf9070deb12e527f2ddfbb509 /drivers
parent0f181328287db30671e9997329cff71395d4af8b (diff)
parentf29ce72795bf335553ab972606bc576b5473995e (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 3a22eb9be37..17b24c580c0 100644
--- 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,