diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-07-03 11:24:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-07-03 11:24:38 +0200 |
| commit | 99f143b316b056a86c8226c15882cc0718f0b3b0 (patch) | |
| tree | 9886e3bacaf27b2a3b127491285303172d11d29e /arch | |
| parent | ARM: OMAP: DMA: Clean-up code (diff) | |
| download | linux-99f143b316b056a86c8226c15882cc0718f0b3b0.tar.xz linux-99f143b316b056a86c8226c15882cc0718f0b3b0.zip | |
ARM: OMAP: SRAM: Move sram-fn.S from plat-omap to mach-omap1
This file is omap1 specific.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/sram.S (renamed from arch/arm/plat-omap/sram-fn.S) | 0 | ||||
| -rw-r--r-- | arch/arm/plat-omap/Makefile | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index c06f5254c0f3..5e9416e024dd 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 index 9e1813c77e05..9e1813c77e05 100644 --- a/arch/arm/plat-omap/sram-fn.S +++ b/arch/arm/mach-omap1/sram.S diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index bc639a30d6d1..2c4051cc79a1 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 := |