aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/sram.S
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-02-23 10:08:33 -0500
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-02-23 10:08:33 -0500
commita010ae86cc27ef660afdcc7e7d4cdbc2b38fce09 (patch)
tree50fb5ee861b3b0e79e31529f3bebb67baf12b7af /arch/arm/mach-omap1/sram.S
parent239a14a340ad4a81cfff4075625382d7f78f5258 (diff)
parent4760195df00982b4e388e859b41a63feed6d0cab (diff)
Merge branch 'for-linaro-2.6.38/dirty/arm/omap-thumb2+merged' of git://git.linaro.org/people/dmart/linux-2.6-arm into linaro-2.6.38linaro-linux-2.6.38-upstream-23Feb2011
Diffstat (limited to 'arch/arm/mach-omap1/sram.S')
-rw-r--r--arch/arm/mach-omap1/sram.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S
index 7724e520d07..692587d07ea 100644
--- a/arch/arm/mach-omap1/sram.S
+++ b/arch/arm/mach-omap1/sram.S
@@ -18,6 +18,7 @@
/*
* Reprograms ULPD and CKCTL.
*/
+ .align 3
ENTRY(omap1_sram_reprogram_clock)
stmfd sp!, {r0 - r12, lr} @ save registers on stack