commit e80a0e6e7ccdf64575d4384cb4172860422f5b81
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Feb 20 10:52:01 2007 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Feb 20 10:52:43 2007 +0000
tree 8960fa71eb73d0f1185e893192411cb873362738
parent 3b0eb4a195a124567cd0dd6f700f8388def542c6
parent 3668b45d46f777b0773ef5ff49531c1144efb6dd

[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>

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 76c8ccc..cc1d850 100644
--- a/include/asm-arm/arch-at91/entry-macro.S
+++ b/include/asm-arm/arch-at91/entry-macro.S
@@ -16,6 +16,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	\base, =(AT91_VA_BASE_SYS + AT91_AIC)		@ base virtual address of AIC peripheral
 	ldr	\irqnr, [\base, #(AT91_AIC_IVR - AT91_AIC)]	@ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)