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-cl7500 | |
| 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-cl7500')
| -rw-r--r-- | include/asm-arm/arch-cl7500/entry-macro.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-arm/arch-cl7500/entry-macro.S b/include/asm-arm/arch-cl7500/entry-macro.S index c9e5395e5106..0cfb89b229d1 100644 --- a/include/asm-arm/arch-cl7500/entry-macro.S +++ b/include/asm-arm/arch-cl7500/entry-macro.S | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | #include <asm/hardware.h> | 1 | #include <asm/hardware.h> |
| 2 | #include <asm/hardware/entry-macro-iomd.S> | 2 | #include <asm/hardware/entry-macro-iomd.S> |
| 3 | .macro get_irqnr_preamble, base, tmp | ||
| 4 | .endm | ||
| 5 | |||
| 6 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 7 | .endm | ||
| 3 | 8 | ||