git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
balloon3.c
diff --git
a/arch/arm/mach-pxa/balloon3.c
b/arch/arm/mach-pxa/balloon3.c
index
f3a456a
..
a34de9a
100644
(file)
--- a/
arch/arm/mach-pxa/balloon3.c
+++ b/
arch/arm/mach-pxa/balloon3.c
@@
-830,4
+830,5
@@
MACHINE_START(BALLOON3, "Balloon3")
.timer = &pxa_timer,
.init_machine = balloon3_init,
.atag_offset = 0x100,
+ .restart = pxa_restart,
MACHINE_END