Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap

[~andy/linux] / drivers / video / Makefile

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 92265b741dc3a4366a6611b825462604ea710e07..bd8dc0ffe723d9070b054af1e74703b053d3da75 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -90,6 +90,7 @@ obj-$(CONFIG_FB_PMAGB_B)        += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)                  += maxinefb.o
 obj-$(CONFIG_FB_TX3912)                  += tx3912fb.o
 obj-$(CONFIG_FB_S1D13XXX)        += s1d13xxxfb.o
+obj-$(CONFIG_FB_IMX)              += imxfb.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o