diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 12:51:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 12:51:28 +0100 |
| commit | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (patch) | |
| tree | 17a3216542d1107f777fd82577c91aebbce597d6 /arch/arm/mach-at91/at91cap9.c | |
| parent | Merge branch 'tegra/cleanup' into next/cleanup (diff) | |
| parent | ARM: 7198/1: arm/imx6: add restart support for imx6q (diff) | |
| download | linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.tar.xz linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.zip | |
Merge branch 'depends/rmk/restart' into next/cleanup
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-shmobile/board-kota2.c
This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/at91cap9.c')
| -rw-r--r-- | arch/arm/mach-at91/at91cap9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 506a26c3fff6..edb879ac04c8 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -314,7 +314,7 @@ static struct at91_gpio_bank at91cap9_gpio[] __initdata = { } }; -static void at91cap9_reset(void) +static void at91cap9_restart(char mode, const char *cmd) { at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); } @@ -337,7 +337,7 @@ static void __init at91cap9_ioremap_registers(void) static void __init at91cap9_initialize(void) { - at91_arch_reset = at91cap9_reset; + arm_pm_restart = at91cap9_restart; at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); /* Register GPIO subsystem */ |