diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 14:25:15 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 14:25:27 +0100 |
commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-pxa/h5000.c | |
parent | Merge branch 'devel-stable' into for-linus (diff) | |
parent | ARM: 7198/1: arm/imx6: add restart support for imx6q (diff) | |
download | linux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.tar.xz linux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.zip |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-pxa/h5000.c')
-rw-r--r-- | arch/arm/mach-pxa/h5000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index 4b5e110640b1..fde6b4c873c4 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c @@ -209,4 +209,5 @@ MACHINE_START(H5400, "HP iPAQ H5000") .handle_irq = pxa25x_handle_irq, .timer = &pxa_timer, .init_machine = h5000_init, + .restart = pxa_restart, MACHINE_END |