Merge branch 'linus' into stackprotector

[karo-tx-linux.git] / arch / arm / plat-omap / Makefile

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index bc639a30d6d1718890576735810772cd51a34e4f..2c4051cc79a13f249e32d4cb6abf31841ee1c258 100644 (file)
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o \
+obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
         usb.o fb.o
 obj-m :=
 obj-n :=