Merge branch 'linus' into timers/nohz

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

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 2feb6870b735d8ed49297a51ecb223fad90e47bd..93ee990618ef32b0905dd5de7bc515aa5a70c14d 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -3,9 +3,15 @@
 #
 
 # Common support
-obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \
+obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \
                devices.o serial.o gpmc.o timer-gp.o
 
+obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
+
+# Functions loaded to SRAM
+obj-$(CONFIG_ARCH_OMAP2420)            += sram242x.o
+obj-$(CONFIG_ARCH_OMAP2430)            += sram243x.o
+
 # Power Management
 obj-$(CONFIG_PM) += pm.o sleep.o