diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-27 03:43:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-27 03:43:01 -0400 |
| commit | e04d6c53a58cee3380adaa66fe2eeffbd82d213c (patch) | |
| tree | 19fcd2cb9ea3af7494515dabaca9844c1527856d /arch/arm/plat-mxc/ssi-fiq.S | |
| parent | e9569c1511d2590a27b46b94bafb7acece034e5c (diff) | |
| parent | bcb22a94f68cde70e820dc7280d1c731e8e695f7 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
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: | |||
| 124 | 1: | 124 | 1: |
| 125 | @ return from FIQ | 125 | @ return from FIQ |
| 126 | subs pc, lr, #4 | 126 | subs pc, lr, #4 |
| 127 | |||
| 128 | .align | ||
| 127 | imx_ssi_fiq_base: | 129 | imx_ssi_fiq_base: |
| 128 | .word 0x0 | 130 | .word 0x0 |
| 129 | imx_ssi_fiq_rx_buffer: | 131 | imx_ssi_fiq_rx_buffer: |