diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/include/mach/entry-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5f3b7fedc66..8f39263c076 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -311,6 +311,7 @@ config ARCH_VEXPRESS | |||
311 | select ICST | 311 | select ICST |
312 | select PLAT_VERSATILE | 312 | select PLAT_VERSATILE |
313 | select PLAT_VERSATILE_CLCD | 313 | select PLAT_VERSATILE_CLCD |
314 | select MULTI_IRQ_HANDLER | ||
314 | help | 315 | help |
315 | This enables support for the ARM Ltd Versatile Express boards. | 316 | This enables support for the ARM Ltd Versatile Express boards. |
316 | 317 | ||
diff --git a/arch/arm/mach-vexpress/include/mach/entry-macro.S b/arch/arm/mach-vexpress/include/mach/entry-macro.S index 73c11297509..a14f9e62ca9 100644 --- a/arch/arm/mach-vexpress/include/mach/entry-macro.S +++ b/arch/arm/mach-vexpress/include/mach/entry-macro.S | |||
@@ -1,5 +1,3 @@ | |||
1 | #include <asm/hardware/entry-macro-gic.S> | ||
2 | |||
3 | .macro disable_fiq | 1 | .macro disable_fiq |
4 | .endm | 2 | .endm |
5 | 3 | ||
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 1fafc324460..7aa07a8ce23 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <asm/hardware/arm_timer.h> | 23 | #include <asm/hardware/arm_timer.h> |
24 | #include <asm/hardware/timer-sp.h> | 24 | #include <asm/hardware/timer-sp.h> |
25 | #include <asm/hardware/sp810.h> | 25 | #include <asm/hardware/sp810.h> |
26 | #include <asm/hardware/gic.h> | ||
26 | 27 | ||
27 | #include <mach/ct-ca9x4.h> | 28 | #include <mach/ct-ca9x4.h> |
28 | #include <mach/motherboard.h> | 29 | #include <mach/motherboard.h> |
@@ -448,5 +449,6 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") | |||
448 | .init_early = v2m_init_early, | 449 | .init_early = v2m_init_early, |
449 | .init_irq = v2m_init_irq, | 450 | .init_irq = v2m_init_irq, |
450 | .timer = &v2m_timer, | 451 | .timer = &v2m_timer, |
452 | .handle_irq = gic_handle_irq, | ||
451 | .init_machine = v2m_init, | 453 | .init_machine = v2m_init, |
452 | MACHINE_END | 454 | MACHINE_END |