diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 00:36:21 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 00:36:21 -0500 |
| commit | 134c428e5a31f2d5ed3a70ba20dac83895ec8b82 (patch) | |
| tree | 0fb28accbf09171b8a1ca792361f4160434529e8 /arch/arm/plat-mxc/ssi-fiq.S | |
| parent | a0496d450ab8c17f6c4d86979b1f6ba486fe9365 (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
| download | linux-stable-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.tar.gz linux-stable-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.tar.bz2 linux-stable-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.zip | |
Merge remote branch 'benh/merge' into benh-next
Diffstat (limited to 'arch/arm/plat-mxc/ssi-fiq.S')
| -rw-r--r-- | arch/arm/plat-mxc/ssi-fiq.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/ssi-fiq.S b/arch/arm/plat-mxc/ssi-fiq.S index 4ddce565b353..8397a2dd19f2 100644 --- 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: |