summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-picoxcell/include/mach
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-11-03 17:29:03 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2011-11-15 18:14:04 +0000
commitc05012ce9a70100dd547042865df751498244ec3 (patch)
tree876632536f917009bdac231fcb86098cc6b1f74e /arch/arm/mach-picoxcell/include/mach
parentbb3a4ebe63194a41b7d4420cbc26732e15aa8242 (diff)
ARM: picoxcell: convert to MULTI_IRQ_HANDLER
Now that there is a generic IRQ handler for multiple VIC devices use it for picoxcell to help building multi platform kernels. Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/mach-picoxcell/include/mach')
-rw-r--r--arch/arm/mach-picoxcell/include/mach/entry-macro.S11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-picoxcell/include/mach/entry-macro.S b/arch/arm/mach-picoxcell/include/mach/entry-macro.S
index a6b09f75d9d..9b505ac00be 100644
--- a/arch/arm/mach-picoxcell/include/mach/entry-macro.S
+++ b/arch/arm/mach-picoxcell/include/mach/entry-macro.S
@@ -9,11 +9,8 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/map.h>
+ .macro disable_fiq
+ .endm
-#define VA_VIC0 IO_ADDRESS(PICOXCELL_VIC0_BASE)
-#define VA_VIC1 IO_ADDRESS(PICOXCELL_VIC1_BASE)
-
-#include <asm/entry-macro-vic2.S>
+ .macro arch_ret_to_user, tmp1, tmp2
+ .endm