Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-at91 / entry-macro.S

diff --git a/include/asm-arm/arch-at91/entry-macro.S b/include/asm-arm/arch-at91/entry-macro.S
index 76c8cccf73aa18bc6c10dcf82507f5b45078c31c..1005eee6219b410da4f384b5879c40e011abb50e 100644 (file)
--- a/include/asm-arm/arch-at91/entry-macro.S
+++ b/include/asm-arm/arch-at91/entry-macro.S
@@ -16,8 +16,14 @@
        .macro  disable_fiq
        .endm
 
-       .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+       .macro  get_irqnr_preamble, base, tmp
        ldr     \base, =(AT91_VA_BASE_SYS + AT91_AIC)           @ base virtual address of AIC peripheral
+       .endm
+
+       .macro  arch_ret_to_user, tmp1, tmp2
+       .endm
+
+       .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
        ldr     \irqnr, [\base, #(AT91_AIC_IVR - AT91_AIC)]     @ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)
        ldr     \irqstat, [\base, #(AT91_AIC_ISR - AT91_AIC)]   @ read interrupt source number
        teq     \irqstat, #0                                    @ ISR is 0 when no current interrupt, or spurious interrupt