projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'wireless-next/master' into ath6kl-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-sa1100
/
h3100.c
diff --git
a/arch/arm/mach-sa1100/h3100.c
b/arch/arm/mach-sa1100/h3100.c
index
b30733a
..
1e6b3c1
100644
(file)
--- a/
arch/arm/mach-sa1100/h3100.c
+++ b/
arch/arm/mach-sa1100/h3100.c
@@
-89,5
+89,6
@@
MACHINE_START(H3100, "Compaq iPAQ H3100")
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = h3100_mach_init,
+ .restart = sa11x0_restart,
MACHINE_END