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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
a37f585
..
071bba9
100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/entry-macro.S
+++ b/
arch/arm/mach-ux500/include/mach/entry-macro.S
@@
-11,15
+11,10
@@
* warranty of any kind, whether express or implied.
*/
#include <mach/hardware.h>
* warranty of any kind, whether express or implied.
*/
#include <mach/hardware.h>
-#define HAVE_GET_IRQNR_PREAMBLE
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq
.endm
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq
.endm
- .macro get_irqnr_preamble, base, tmp
- ldr \base, =IO_ADDRESS(UX500_GIC_CPU_BASE)
- .endm
-
.macro arch_ret_to_user, tmp1, tmp2
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm