diff options
| author | Arnd Bergmann | 2012-01-09 17:16:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-01-09 17:16:29 +0100 |
| commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
| tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/mach-pxa/vpac270.c | |
| parent | Merge branch 'drivers/rtc-sa1100' into next/drivers (diff) | |
| parent | Merge branch 'samsung/cleanup' into samsung/driver (diff) | |
| download | kernel-qcow2-linux-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.gz kernel-qcow2-linux-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.xz kernel-qcow2-linux-dcf7ec5ee62a78123057a1e286c88ca739717409.zip | |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/vpac270.c')
| -rw-r--r-- | arch/arm/mach-pxa/vpac270.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index 9edeec65f6a3..1f5cfa96f6d6 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c @@ -721,5 +721,6 @@ MACHINE_START(VPAC270, "Voipac PXA270") .init_irq = pxa27x_init_irq, .handle_irq = pxa27x_handle_irq, .timer = &pxa_timer, - .init_machine = vpac270_init + .init_machine = vpac270_init, + .restart = pxa_restart, MACHINE_END |