diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
| commit | 61b80086a525c8a6081257ae40da5dee2bcaee16 (patch) | |
| tree | 675da35e4c03be3a5ca17bf6430e5b51dfed6296 /arch/arm/mach-msm | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 230f984662d7e0e4a9597c665fd4f53130666e7d (diff) | |
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/entry-macro.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/include/mach/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S index 41f7003ef34f..f2ae9087f654 100644 --- a/arch/arm/mach-msm/include/mach/entry-macro.S +++ b/arch/arm/mach-msm/include/mach/entry-macro.S | |||
| @@ -16,12 +16,6 @@ | |||
| 16 | * | 16 | * |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | .macro disable_fiq | ||
| 20 | .endm | ||
| 21 | |||
| 22 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 23 | .endm | ||
| 24 | |||
| 25 | #if !defined(CONFIG_ARM_GIC) | 19 | #if !defined(CONFIG_ARM_GIC) |
| 26 | #include <mach/msm_iomap.h> | 20 | #include <mach/msm_iomap.h> |
| 27 | 21 | ||