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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
d2net_v2-setup.c
diff --git
a/arch/arm/mach-kirkwood/d2net_v2-setup.c
b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index
a31c949
..
043cfd5
100644
(file)
--- a/
arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/
arch/arm/mach-kirkwood/d2net_v2-setup.c
@@
-224,6
+224,7
@@
MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
.boot_params = 0x00000100,
.init_machine = d2net_v2_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END