diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 19:30:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 19:30:43 -0400 |
| commit | 0a40a55fd1fde3875769025ee8a4a7059c7a042d (patch) | |
| tree | ccbf74a5ba9f76bcf9070deb12e527f2ddfbb509 | |
| parent | 0f181328287db30671e9997329cff71395d4af8b (diff) | |
| parent | f29ce72795bf335553ab972606bc576b5473995e (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
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3a22eb9be378..17b24c580c09 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
| @@ -71,6 +71,7 @@ config DRM_I915 | |||
| 71 | select FB_CFB_COPYAREA | 71 | select FB_CFB_COPYAREA |
| 72 | select FB_CFB_IMAGEBLIT | 72 | select FB_CFB_IMAGEBLIT |
| 73 | select FB | 73 | select FB |
| 74 | select FRAMEBUFFER_CONSOLE if !EMBEDDED | ||
| 74 | tristate "i915 driver" | 75 | tristate "i915 driver" |
| 75 | help | 76 | help |
| 76 | Choose this option if you have a system that has Intel 830M, 845G, | 77 | Choose this option if you have a system that has Intel 830M, 845G, |