efifb/imacfb consolidation + hardware support

Remove imacfb entirely, merging its DMI table into the (otherwise very
similar) efifb driver.  This also adds hardware support for many of the
newer Intel Apple hardware.  This has been fairly well tested; we've been
shipping it in Fedora for some time.

Signed-off-by: Peter Jones <pjones@redhat.com>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e63e5648e0a6..3b296e410f91 100644
--- 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"