Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2...

[pandora-kernel.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index ea1e26f..82b2a67 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -153,6 +153,10 @@ obj-$(CONFIG_ARCH_OMAP4)           += omap_hwmod_44xx_data.o
 # EMU peripherals
 obj-$(CONFIG_OMAP3_EMU)                        += emu.o
 
+# L3 interconnect
+obj-$(CONFIG_ARCH_OMAP3)               += omap_l3_smx.o
+obj-$(CONFIG_ARCH_OMAP4)               += omap_l3_noc.o
+
 obj-$(CONFIG_OMAP_MBOX_FWK)            += mailbox_mach.o
 mailbox_mach-objs                      := mailbox.o
 
@@ -263,3 +267,6 @@ obj-y                                       += $(smc91x-m) $(smc91x-y)
 smsc911x-$(CONFIG_SMSC911X)            := gpmc-smsc911x.o
 obj-y                                  += $(smsc911x-m) $(smsc911x-y)
 obj-$(CONFIG_ARCH_OMAP4)               += hwspinlock.o
+
+disp-$(CONFIG_OMAP2_DSS)               := display.o
+obj-y                                  += $(disp-m) $(disp-y)