diff options
author | Peter Jones <pjones@redhat.com> | 2008-10-16 01:03:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:44 -0400 |
commit | 7c08c9ae0c145807c0dae4a55f240fa3d4fd5262 (patch) | |
tree | 63e2edd3731e0293b4190a82391e2d3f27e61983 /drivers/video/Makefile | |
parent | f928ac0a9810d46c8ba3bde7c969984340da9f5d (diff) |
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>
Diffstat (limited to 'drivers/video/Makefile')
-rw-r--r-- | drivers/video/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index dcae8d402fb2..2bc94d8eb3c8 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
@@ -125,7 +125,6 @@ obj-$(CONFIG_FB_CARMINE) += carminefb.o | |||
125 | # Platform or fallback drivers go here | 125 | # Platform or fallback drivers go here |
126 | obj-$(CONFIG_FB_UVESA) += uvesafb.o | 126 | obj-$(CONFIG_FB_UVESA) += uvesafb.o |
127 | obj-$(CONFIG_FB_VESA) += vesafb.o | 127 | obj-$(CONFIG_FB_VESA) += vesafb.o |
128 | obj-$(CONFIG_FB_IMAC) += imacfb.o | ||
129 | obj-$(CONFIG_FB_EFI) += efifb.o | 128 | obj-$(CONFIG_FB_EFI) += efifb.o |
130 | obj-$(CONFIG_FB_VGA16) += vga16fb.o | 129 | obj-$(CONFIG_FB_VGA16) += vga16fb.o |
131 | obj-$(CONFIG_FB_OF) += offb.o | 130 | obj-$(CONFIG_FB_OF) += offb.o |