projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b56a7c6
)
ARM: restart: Versatile Express: use new restart hook
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Fri, 4 Nov 2011 15:47:50 +0000
(15:47 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:57:21 +0000
(12:57 +0000)
Hook the Versatile Express platform restart code into the new restart
hook.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-vexpress/v2m.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-vexpress/v2m.c
b/arch/arm/mach-vexpress/v2m.c
index
1fafc32
..
b9a465b
100644
(file)
--- a/
arch/arm/mach-vexpress/v2m.c
+++ b/
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