diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 05:52:01 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 05:52:43 -0500 |
| commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
| tree | 8960fa71eb73d0f1185e893192411cb873362738 /include/asm-arm/arch-imx/entry-macro.S | |
| parent | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (diff) | |
| parent | 3668b45d46f777b0773ef5ff49531c1144efb6dd (diff) | |
[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/entry-macro.S')
| -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 @@ | |||
| 11 | 11 | ||
| 12 | .macro disable_fiq | 12 | .macro disable_fiq |
| 13 | .endm | 13 | .endm |
| 14 | |||
| 15 | .macro get_irqnr_preamble, base, tmp | ||
| 16 | .endm | ||
| 17 | |||
| 18 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 19 | .endm | ||
| 20 | |||
| 14 | #define AITC_NIVECSR 0x40 | 21 | #define AITC_NIVECSR 0x40 |
| 15 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 22 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 16 | ldr \base, =IO_ADDRESS(IMX_AITC_BASE) | 23 | ldr \base, =IO_ADDRESS(IMX_AITC_BASE) |