Merge branches 'release' and 'menlo' into release

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

diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
index efe98661cab55c68b541686e0b7fe844e62dfbb5..99da8b6d2c3650d6418f832add4d221e50ada887 100644 (file)
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@ -19,6 +19,11 @@ objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o
 objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o
 objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o
 objs-y$(CONFIG_MACH_OMAP_PALMTT) += lcd_palmtt.o
+objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o
+objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
+objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
+objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
+objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o
 
 omapfb-objs := $(objs-yy)