diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 10:27:34 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 10:27:34 -0400 |
commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/arm/mach-vexpress/include/mach/entry-macro.S | |
parent | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff) | |
parent | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff) |
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-vexpress/include/mach/entry-macro.S')
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/entry-macro.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/entry-macro.S b/arch/arm/mach-vexpress/include/mach/entry-macro.S deleted file mode 100644 index a14f9e62ca92..000000000000 --- a/arch/arm/mach-vexpress/include/mach/entry-macro.S +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | .macro disable_fiq | ||
2 | .endm | ||
3 | |||
4 | .macro arch_ret_to_user, tmp1, tmp2 | ||
5 | .endm | ||