diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 10:52:01 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 10:52:43 +0000 |
| commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
| tree | 8960fa71eb73d0f1185e893192411cb873362738 /include/asm-arm/arch-imx | |
| 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-dev-e80a0e6e7ccdf64575d4384cb4172860422f5b81.tar.xz linux-dev-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-imx')
| -rw-r--r-- | include/asm-arm/arch-imx/entry-macro.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-arm/arch-imx/entry-macro.S b/include/asm-arm/arch-imx/entry-macro.S index 61bb0bdc1b16..0b84e81031c3 100644 --- a/include/asm-arm/arch-imx/entry-macro.S +++ b/include/asm-arm/arch-imx/entry-macro.S @@ -11,6 +11,13 @@ .macro disable_fiq .endm + + .macro get_irqnr_preamble, base, tmp + .endm + + .macro arch_ret_to_user, tmp1, tmp2 + .endm + #define AITC_NIVECSR 0x40 .macro get_irqnr_and_base, irqnr, irqstat, base, tmp ldr \base, =IO_ADDRESS(IMX_AITC_BASE) |