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

diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262149c701b0908b6f54b31c90ba206fbb82,485a11eeaceb6f469d5078e9775e2070a98d109a..e577cfe27e72c0d328e965d9bef23c610ccda671
--- 1/arch/arm/mach-tegra/include/mach/entry-macro.S
--- 2/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