diff --git a/[refs] b/[refs] index 3fdc4d94be8e..84caa61b39a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99f143b316b056a86c8226c15882cc0718f0b3b0 +refs/heads/master: 373a67021d00a8b8c86bfa19f8914377de05b4bd diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index 2feb6870b735..6c59b267105d 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -3,7 +3,7 @@ # # 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 sram242x.o memory.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o # Power Management diff --git a/trunk/arch/arm/mach-omap2/sram-fn.S b/trunk/arch/arm/mach-omap2/sram242x.S similarity index 100% rename from trunk/arch/arm/mach-omap2/sram-fn.S rename to trunk/arch/arm/mach-omap2/sram242x.S