Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/include/mach/entry-macro.S between commit
afed2a261825 ("ARM: tegra2: convert to CONFIG_MULTI_IRQ_HANDLER") from
the arm tree and commit f5ce5e7e9cc3 (arm/tegra: Remove code that's
ifndef CONFIG_ARM_GIC"") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262,485a11e..0000000
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@@ -16,23 -24,10 +16,8 @@@
  	.macro	disable_fiq
  	.endm
  
 -	.macro	get_irqnr_preamble, base, tmp
 -	movw \base, #(ICTRL_BASE & 0x0000ffff)
 -	movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
 +	.macro	arch_ret_to_user, tmp1, tmp2
  	.endm
  
- #if !defined(CONFIG_ARM_GIC)
- 	/* legacy interrupt controller for AP16 */
- 
- 	.macro	get_irqnr_preamble, base, tmp
- 	@ enable imprecise aborts
- 	cpsie	a
- 	@ EVP base at 0xf010f000
- 	mov \base, #0xf0000000
- 	orr \base, #0x00100000
- 	orr \base, #0x0000f000
- 	.endm
- 
- 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
- 	ldr \irqnr, [\base, #0x20]	@ EVT_IRQ_STS
- 	cmp \irqnr, #0x80
+ 	.macro  arch_ret_to_user, tmp1, tmp2
  	.endm
- #endif