diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:06:36 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:06:36 +0000 |
| commit | 421b759b86eb8a914cbbd11f6d09a74f411762c6 (patch) | |
| tree | 505ca7f23987d8eaaa519a7e8506b854e2c0d030 /arch/arm/mach-pxa/mioa701.c | |
| parent | e067096c8d57d191f29d734cd5692695c95cc36e (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
| download | op-kernel-dev-421b759b86eb8a914cbbd11f6d09a74f411762c6.zip op-kernel-dev-421b759b86eb8a914cbbd11f6d09a74f411762c6.tar.gz | |
Merge branch 'samsung/cleanup' into next/boards
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/mioa701.c')
| -rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index f2d7521..dce71b4 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c @@ -692,13 +692,13 @@ static void mioa701_machine_exit(void); static void mioa701_poweroff(void) { mioa701_machine_exit(); - arm_machine_restart('s', NULL); + pxa_restart('s', NULL); } static void mioa701_restart(char c, const char *cmd) { mioa701_machine_exit(); - arm_machine_restart('s', cmd); + pxa_restart('s', cmd); } static struct gpio global_gpios[] = { @@ -739,7 +739,6 @@ static void __init mioa701_machine_init(void) pxa_set_udc_info(&mioa701_udc_info); pxa_set_ac97_info(&mioa701_ac97_info); pm_power_off = mioa701_poweroff; - arm_pm_restart = mioa701_restart; platform_add_devices(devices, ARRAY_SIZE(devices)); gsm_init(); @@ -763,4 +762,5 @@ MACHINE_START(MIOA701, "MIO A701") .handle_irq = &pxa27x_handle_irq, .init_machine = mioa701_machine_init, .timer = &pxa_timer, + .restart = mioa701_restart, MACHINE_END |
