aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c64xx/include
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-11-04 01:10:04 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2011-11-15 18:14:03 +0000
commit774b51f8f8269cb9a2cdbe2ac2c0a2ff62250b01 (patch)
tree9f55d4d94bc5064500980aaae083f8eb795bdd9e /arch/arm/mach-s3c64xx/include
parent42ab5304547b1d40909eeb499b5f38b99410e597 (diff)
ARM: s3c64xx: convert to MULTI_IRQ_HANDLER
Now that there is a generic IRQ handler for multiple VIC devices use it for s3c64xx to help building multi platform kernels. Cc: Ben Dooks <ben-linux@fluff.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/entry-macro.S7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/entry-macro.S b/arch/arm/mach-s3c64xx/include/mach/entry-macro.S
index dd362604dcc..dc2bc15142c 100644
--- a/arch/arm/mach-s3c64xx/include/mach/entry-macro.S
+++ b/arch/arm/mach-s3c64xx/include/mach/entry-macro.S
@@ -12,7 +12,8 @@
* warranty of any kind, whether express or implied.
*/
-#include <mach/map.h>
-#include <mach/irqs.h>
+ .macro disable_fiq
+ .endm
-#include <asm/entry-macro-vic2.S>
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm