From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 May 2008 18:45:46 +0000 (-0700)
Subject: ARM: OMAP: Move sram-fn.S from plat-omap to mach-omap1
X-Git-Tag: v2.6.26-omap1~123^2~84
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fe2c08002adea304a13ccb806aa1ab4058607094;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Move sram-fn.S from plat-omap to mach-omap1

This file is omap1 specific.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 6ebf23b57ad..c5245118b9a 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o
+obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o devices.o
 
 obj-$(CONFIG_OMAP_MPU_TIMER)	+= time.o
 obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/mach-omap1/sram.S
similarity index 100%
rename from arch/arm/plat-omap/sram-fn.S
rename to arch/arm/mach-omap1/sram.S
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index a3f1f5cbf3d..93bbb64cc49 100644
--- 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 :=