projects
/
cascardo
/
linux.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 master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
include
/
asm-arm
/
arch-realview
/
entry-macro.S
diff --git
a/include/asm-arm/arch-realview/entry-macro.S
b/include/asm-arm/arch-realview/entry-macro.S
index
1a6eec8
..
138838d
100644
(file)
--- a/
include/asm-arm/arch-realview/entry-macro.S
+++ b/
include/asm-arm/arch-realview/entry-macro.S
@@
-13,6
+13,12
@@
.macro disable_fiq
.endm
+ .macro get_irqnr_preamble, base, tmp
+ .endm
+
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm
+
/*
* The interrupt numbering scheme is defined in the
* interrupt controller spec. To wit: