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 d17ca1a211a9f5d9098b0a999ae75332bf8c86d2..282ea007013aea051debf1e6c859f80aec461e8c 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -14,11 +14,11 @@ 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
@@ -35,3 +35,4 @@ obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
 
 # DSP subsystem
 obj-y += dsp/
+obj-$(CONFIG_OMAP_DSP) += mailbox.o