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 git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-ux500/include/mach/entry-macro.S
b/arch/arm/mach-ux500/include/mach/entry-macro.S
index
eece330
..
60ea88d
100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/entry-macro.S
+++ b/
arch/arm/mach-ux500/include/mach/entry-macro.S
@@
-17,7
+17,7
@@
.endm
.macro get_irqnr_preamble, base, tmp
- ldr \base, =IO_ADDRESS(U
8
500_GIC_CPU_BASE)
+ ldr \base, =IO_ADDRESS(U
X
500_GIC_CPU_BASE)
.endm
.macro arch_ret_to_user, tmp1, tmp2