git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.39-rc6' into x86/cleanups
[pandora-kernel.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
4ddce56
..
8397a2d
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: