efifb/imacfb consolidation + hardware support

[linux-2.6-omap-h63xx.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e63e5648e0a628428f7e24904f8796661bf1a3b2..3b296e410f91c3057ba475f9c83d1ec82f8f3a9c 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -689,23 +689,14 @@ config FB_VESA
 
 config FB_EFI
        bool "EFI-based Framebuffer Support"
-       depends on (FB = y) && X86
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       help
-         This is the EFI frame buffer device driver. If the firmware on
-         your platform is UEFI2.0, select Y to add support for
-         Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
-       bool "Intel-based Macintosh Framebuffer Support"
        depends on (FB = y) && X86 && EFI
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        help
-         This is the frame buffer device driver for the Intel-based Macintosh
+         This is the EFI frame buffer device driver. If the firmware on
+         your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+         using the EFI framebuffer as your console.
 
 config FB_N411
        tristate "N411 Apollo/Hecuba devkit support"