From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Dec 2011 22:19:50 +0000 (+0000)
Subject: Merge branch 'tegra/cleanup' into next/cleanup
X-Git-Tag: upstream/snapshot3+hdmi~8412^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70d84a6431d732cbc4e68e72b6890cdd3865d43d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'tegra/cleanup' into next/cleanup

* tegra/cleanup:
  arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
  arm/tegra: remove unused defines
  arm/tegra: fix variable formatting in makefile

Conflicts:
	arch/arm/mach-tegra/include/mach/entry-macro.S
---

70d84a6431d732cbc4e68e72b6890cdd3865d43d
diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262,485a11e..e577cfe
--- 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,5 @@@
  	.macro	disable_fiq
  	.endm
  
 -	.macro	get_irqnr_preamble, base, tmp
 -	movw \base, #(ICTRL_BASE & 0x0000ffff)
 -	movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
 -	.endm
 -
 -	.macro  arch_ret_to_user, tmp1, tmp2
 +	.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
- 	.endm
- #endif