Merge omap-drivers

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / Makefile

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 17656b6688c4b7a3c69ca96f252e0d733446491e..282ea007013aea051debf1e6c859f80aec461e8c 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -14,18 +14,25 @@ obj-$(CONFIG_OMAP_32K_TIMER)        += timer32k.o
 # OCPI interconnect support for 1710, 1610 and 5912
 obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
 
+obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
+
 # STI support
 obj-$(CONFIG_OMAP_STI) += sti/
 
-obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
-
 obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o
 obj-$(CONFIG_OMAP_COMPONENT_VERSION) += component-version.o
+obj-$(CONFIG_OMAP_GPIO_SWITCH) += gpio-switch.o
 obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
 obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
 
+# OMAP MMU framework
+obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
+
+# OMAP mailbox framework
+obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
+
 # DSP subsystem
 obj-y += dsp/
 obj-$(CONFIG_OMAP_DSP) += mailbox.o