diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 11:52:01 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 11:52:43 +0100 |
commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
tree | 8960fa71eb73d0f1185e893192411cb873362738 /include/asm-arm/arch-ixp4xx | |
parent | Merge the easy part of the IOP branch (diff) | |
parent | [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx (diff) | |
download | linux-e80a0e6e7ccdf64575d4384cb4172860422f5b81.tar.xz linux-e80a0e6e7ccdf64575d4384cb4172860422f5b81.zip |
[ARM] Merge remaining IOP code
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ixp4xx')
-rw-r--r-- | include/asm-arm/arch-ixp4xx/entry-macro.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ixp4xx/entry-macro.S b/include/asm-arm/arch-ixp4xx/entry-macro.S index 27e124132e4c..dadb568b7ef0 100644 --- a/include/asm-arm/arch-ixp4xx/entry-macro.S +++ b/include/asm-arm/arch-ixp4xx/entry-macro.S @@ -12,6 +12,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 \irqstat, =(IXP4XX_INTC_BASE_VIRT+IXP4XX_ICIP_OFFSET) ldr \irqstat, [\irqstat] @ get interrupts |