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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/plat-mxc/include/mach/entry-macro.S
b/arch/arm/plat-mxc/include/mach/entry-macro.S
index
5f01d60
..
7cf290e
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/entry-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/entry-macro.S
@@
-18,7
+18,8
@@
.endm
.macro get_irqnr_preamble, base, tmp
.endm
.macro get_irqnr_preamble, base, tmp
- ldr \base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR)
+ ldr \base, =avic_base
+ ldr \base, [\base]
#ifdef CONFIG_MXC_IRQ_PRIOR
ldr r4, [\base, #AVIC_NIMASK]
#endif
#ifdef CONFIG_MXC_IRQ_PRIOR
ldr r4, [\base, #AVIC_NIMASK]
#endif