summaryrefslogtreecommitdiffstats
path: root/drivers/video/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-16 23:28:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-16 23:28:04 +0100
commit3879f5d6f03b66626af014cbb6071ad4d79b1c42 (patch)
tree018c183306253f12c1d9da739a78d41be71e1cb3 /drivers/video/Makefile
parent[ARM] 5427/1: h3600: ipaq_model_ops final cleanup (diff)
parenti.MX31: framebuffer driver (diff)
downloadlinux-3879f5d6f03b66626af014cbb6071ad4d79b1c42.tar.xz
linux-3879f5d6f03b66626af014cbb6071ad4d79b1c42.zip
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel
Conflicts: drivers/video/mx3fb.c
Diffstat (limited to 'drivers/video/Makefile')
-rw-r--r--drivers/video/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index edd5a85c1eb5..bb265eca7d57 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -133,7 +133,7 @@ obj-$(CONFIG_FB_VGA16) += vga16fb.o
obj-$(CONFIG_FB_OF) += offb.o
obj-$(CONFIG_FB_BF54X_LQ043) += bf54x-lq043fb.o
obj-$(CONFIG_FB_BFIN_T350MCQB) += bfin-t350mcqb-fb.o
-obj-$(CONFIG_FB_MX3) += mx3fb.o
+obj-$(CONFIG_FB_MX3) += mx3fb.o
# the test framebuffer is last
obj-$(CONFIG_FB_VIRTUAL) += vfb.o