aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5p64x0/include/mach
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-09-27 20:53:31 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2011-11-15 18:14:04 +0000
commitbb3a4ebe63194a41b7d4420cbc26732e15aa8242 (patch)
tree7d0da639bfedbe74f2a8db7d57790ad46f1a0fd2 /arch/arm/mach-s5p64x0/include/mach
parentc8be7acd63ed65aa034fc036bb2c7867f30561bd (diff)
downloadlinux-linaro-stable-bb3a4ebe63194a41b7d4420cbc26732e15aa8242.tar.gz
ARM: samsung: convert to MULTI_IRQ_HANDLER
Now that there is a generic IRQ handler for multiple VIC devices use it for samsung to help building multi platform kernels. Cc: Kukjin Kim <kgene.kim@samsung.com> Tested-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/include/mach')
-rw-r--r--arch/arm/mach-s5p64x0/include/mach/entry-macro.S7
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 @@
* published by the Free Software Foundation.
*/
-#include <mach/map.h>
-#include <plat/irqs.h>
+ .macro disable_fiq
+ .endm
-#include <asm/entry-macro-vic2.S>
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm