diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-pxa/stargate2.c | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
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/stargate2.c')
| -rw-r--r-- | arch/arm/mach-pxa/stargate2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 4c9a48bef569..80d7f23ad0fd 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c | |||
| @@ -1005,6 +1005,7 @@ MACHINE_START(INTELMOTE2, "IMOTE 2") | |||
| 1005 | .timer = &pxa_timer, | 1005 | .timer = &pxa_timer, |
| 1006 | .init_machine = imote2_init, | 1006 | .init_machine = imote2_init, |
| 1007 | .atag_offset = 0x100, | 1007 | .atag_offset = 0x100, |
| 1008 | .restart = pxa_restart, | ||
| 1008 | MACHINE_END | 1009 | MACHINE_END |
| 1009 | #endif | 1010 | #endif |
| 1010 | 1011 | ||
| @@ -1017,5 +1018,6 @@ MACHINE_START(STARGATE2, "Stargate 2") | |||
| 1017 | .timer = &pxa_timer, | 1018 | .timer = &pxa_timer, |
| 1018 | .init_machine = stargate2_init, | 1019 | .init_machine = stargate2_init, |
| 1019 | .atag_offset = 0x100, | 1020 | .atag_offset = 0x100, |
| 1021 | .restart = pxa_restart, | ||
| 1020 | MACHINE_END | 1022 | MACHINE_END |
| 1021 | #endif | 1023 | #endif |