Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / arch / arm / plat-mxc / ssi-fiq.S

diff --git a/arch/arm/plat-mxc/ssi-fiq.S b/arch/arm/plat-mxc/ssi-fiq.S
index 4ddce565b353745d32f31b0023ff1df1ad93f02d..8397a2dd19f2d6caad2adb5824ca13537c8d19fd 100644 (file)
--- a/arch/arm/plat-mxc/ssi-fiq.S
+++ b/arch/arm/plat-mxc/ssi-fiq.S
@@ -124,6 +124,8 @@ imx_ssi_fiq_start:
 1:
                @ return from FIQ
                subs    pc, lr, #4
+
+               .align
 imx_ssi_fiq_base:
                .word 0x0
 imx_ssi_fiq_rx_buffer: