summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pnx4008/include/mach/entry-macro.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-21 18:27:34 +0400
committerArnd Bergmann <arnd@arndb.de>2012-03-21 18:27:34 +0400
commit2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch)
tree711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/arm/mach-pnx4008/include/mach/entry-macro.S
parentb2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff)
parented1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff)
downloadlinux-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.tar.xz
Merge branch 'tegra/cleanups' into next/timer
Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pnx4008/include/mach/entry-macro.S')
-rw-r--r--arch/arm/mach-pnx4008/include/mach/entry-macro.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-pnx4008/include/mach/entry-macro.S b/arch/arm/mach-pnx4008/include/mach/entry-macro.S
index db7eeebf30d7..77a555846719 100644
--- a/arch/arm/mach-pnx4008/include/mach/entry-macro.S
+++ b/arch/arm/mach-pnx4008/include/mach/entry-macro.S
@@ -25,15 +25,9 @@
#define SIC1_BASE_INT 32
#define SIC2_BASE_INT 64
- .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
/* decode the MIC interrupt numbers */
ldr \base, =IO_ADDRESS(PNX4008_INTCTRLMIC_BASE)