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
This commit is contained in:
@@ -71,6 +71,7 @@ config DRM_I915
|
|||||||
select FB_CFB_COPYAREA
|
select FB_CFB_COPYAREA
|
||||||
select FB_CFB_IMAGEBLIT
|
select FB_CFB_IMAGEBLIT
|
||||||
select FB
|
select FB
|
||||||
|
select FRAMEBUFFER_CONSOLE if !EMBEDDED
|
||||||
tristate "i915 driver"
|
tristate "i915 driver"
|
||||||
help
|
help
|
||||||
Choose this option if you have a system that has Intel 830M, 845G,
|
Choose this option if you have a system that has Intel 830M, 845G,
|
||||||
|
Reference in New Issue
Block a user