diff --git a/[refs] b/[refs] index 389df4bd4635..e87a9bb4d23a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b56a7c6b36388b3eca887bd5d24f297e63e5bb5b +refs/heads/master: f5733a1e80fa0b40bea815ddf605ece272c6dac1 diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c index 1fafc3244607..b9a465bd2d0f 100644 --- a/trunk/arch/arm/mach-vexpress/v2m.c +++ b/trunk/arch/arm/mach-vexpress/v2m.c @@ -437,7 +437,6 @@ static void __init v2m_init(void) amba_device_register(v2m_amba_devs[i], &iomem_resource); pm_power_off = v2m_power_off; - arm_pm_restart = v2m_restart; ct_desc->init_tile(); } @@ -449,4 +448,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") .init_irq = v2m_init_irq, .timer = &v2m_timer, .init_machine = v2m_init, + .restart = v2m_restart, MACHINE_END