Преглед на файлове

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
Linus Torvalds преди 16 години
родител
ревизия
0a40a55fd1
променени са 1 файла, в които са добавени 1 реда и са изтрити 0 реда
  1. 1 0
      drivers/gpu/drm/Kconfig

+ 1 - 0
drivers/gpu/drm/Kconfig

@@ -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,