summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-omap/entry-macro.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-03-02 11:59:16 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-03-02 12:04:16 +0000
commit6139dbbb7769c7251e04813f577454c6c9293e15 (patch)
tree588b44b4b8929caf812d440ec371331658fd7da3 /include/asm-arm/arch-omap/entry-macro.S
parent9623b3732d11b0a18d9af3419f680d27ea24b014 (diff)
parent1f4d1774133f596a3c4f520859890ad93769e523 (diff)
downloadop-kernel-dev-6139dbbb7769c7251e04813f577454c6c9293e15.zip
op-kernel-dev-6139dbbb7769c7251e04813f577454c6c9293e15.tar.gz
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'include/asm-arm/arch-omap/entry-macro.S')
-rw-r--r--include/asm-arm/arch-omap/entry-macro.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index c90dff4..f6967c8 100644
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -61,6 +61,12 @@
.macro disable_fiq
.endm
+ .macro get_irqnr_preamble, base, tmp
+ .endm
+
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm
+
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
ldr \base, =VA_IC_BASE
ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */
OpenPOWER on IntegriCloud