diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
| commit | b46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch) | |
| tree | a5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/mach-s5p64x0/include/mach/entry-macro.S | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | a890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
Diffstat (limited to 'arch/arm/mach-s5p64x0/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/entry-macro.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/entry-macro.S b/arch/arm/mach-s5p64x0/include/mach/entry-macro.S index 10b62b4f8211..fbb246d0a3df 100644 --- a/arch/arm/mach-s5p64x0/include/mach/entry-macro.S +++ b/arch/arm/mach-s5p64x0/include/mach/entry-macro.S | |||
| @@ -10,7 +10,8 @@ | |||
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <mach/map.h> | 13 | .macro disable_fiq |
| 14 | #include <plat/irqs.h> | 14 | .endm |
| 15 | 15 | ||
| 16 | #include <asm/entry-macro-vic2.S> | 16 | .macro arch_ret_to_user, tmp1, tmp2 |
| 17 | .endm | ||