diff options
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 1fafc3244607..6dd10e320ef6 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> |
@@ -437,7 +438,6 @@ static void __init v2m_init(void) | |||
437 | amba_device_register(v2m_amba_devs[i], &iomem_resource); | 438 | amba_device_register(v2m_amba_devs[i], &iomem_resource); |
438 | 439 | ||
439 | pm_power_off = v2m_power_off; | 440 | pm_power_off = v2m_power_off; |
440 | arm_pm_restart = v2m_restart; | ||
441 | 441 | ||
442 | ct_desc->init_tile(); | 442 | ct_desc->init_tile(); |
443 | } | 443 | } |
@@ -448,5 +448,7 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") | |||
448 | .init_early = v2m_init_early, | 448 | .init_early = v2m_init_early, |
449 | .init_irq = v2m_init_irq, | 449 | .init_irq = v2m_init_irq, |
450 | .timer = &v2m_timer, | 450 | .timer = &v2m_timer, |
451 | .handle_irq = gic_handle_irq, | ||
451 | .init_machine = v2m_init, | 452 | .init_machine = v2m_init, |
453 | .restart = v2m_restart, | ||
452 | MACHINE_END | 454 | MACHINE_END |