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 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-loki
/
lb88rc8480-setup.c
diff --git
a/arch/arm/mach-loki/lb88rc8480-setup.c
b/arch/arm/mach-loki/lb88rc8480-setup.c
index a1e75e7fc50092d9b4e6268c5464ec4524349ded..35eae4e6abb26b6a190f6e09b3597651c963567b 100644
(file)
--- a/
arch/arm/mach-loki/lb88rc8480-setup.c
+++ b/
arch/arm/mach-loki/lb88rc8480-setup.c
@@
-93,6
+93,7
@@
MACHINE_START(LB88RC8480, "Marvell LB88RC8480 Development Board")
.boot_params = 0x00000100,
.init_machine = lb88rc8480_init,
.map_io = loki_map_io,
+ .init_early = loki_init_early,
.init_irq = loki_init_irq,
.timer = &loki_timer,
MACHINE_END