git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-queue' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-kirkwood
/
mv88f6281gtw_ge-setup.c
diff --git
a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
index 1e5266f57e2a2d3e6a46d7761e8b622c5f3928ca..00cca22eca6f733f19e36c397060e9565fb832c8 100644
(file)
--- a/
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
+++ b/
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@@
-166,6
+166,7
@@
MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board")
.boot_params = 0x00000100,
.init_machine = mv88f6281gtw_ge_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END