diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-pxa/capc7117.c | |
parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
download | talos-op-linux-b48741cce3be32a48af9a2b272f3f13a077375cf.tar.gz talos-op-linux-b48741cce3be32a48af9a2b272f3f13a077375cf.zip |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'arch/arm/mach-pxa/capc7117.c')
-rw-r--r-- | arch/arm/mach-pxa/capc7117.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c index 4efc16d39c79..c2f0be040d27 100644 --- a/arch/arm/mach-pxa/capc7117.c +++ b/arch/arm/mach-pxa/capc7117.c @@ -153,5 +153,6 @@ MACHINE_START(CAPC7117, .init_irq = pxa3xx_init_irq, .handle_irq = pxa3xx_handle_irq, .timer = &pxa_timer, - .init_machine = capc7117_init + .init_machine = capc7117_init, + .restart = pxa_restart, MACHINE_END |