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 branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
openrd-setup.c
diff --git
a/arch/arm/mach-kirkwood/openrd-setup.c
b/arch/arm/mach-kirkwood/openrd-setup.c
index
cfcca41
..
f69beef
100644
(file)
--- a/
arch/arm/mach-kirkwood/openrd-setup.c
+++ b/
arch/arm/mach-kirkwood/openrd-setup.c
@@
-217,6
+217,7
@@
MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
@@
-228,6
+229,7
@@
MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
@@
-239,6
+241,7
@@
MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
.boot_params = 0x00000100,
.init_machine = openrd_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END