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-sa1100/nanoengine.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-sa1100/nanoengine.c')
| -rw-r--r-- | arch/arm/mach-sa1100/nanoengine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index d480438579dd..85f6ee672225 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c @@ -117,4 +117,5 @@ MACHINE_START(NANOENGINE, "BSE nanoEngine") .init_irq = sa1100_init_irq, .timer = &sa1100_timer, .init_machine = nanoengine_init, + .restart = sa11x0_restart, MACHINE_END |