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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mv78xx0
/
rd78x00-masa-setup.c
diff --git
a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
index
3511ad4
..
d927f14
100644
(file)
--- a/
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
+++ b/
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
@@
-81,6
+81,7
@@
MACHINE_START(RD78X00_MASA, "Marvell RD-78x00-MASA Development Board")
.boot_params = 0x00000100,
.init_machine = rd78x00_masa_init,
.map_io = mv78xx0_map_io,
+ .init_early = mv78xx0_init_early,
.init_irq = mv78xx0_init_irq,
.timer = &mv78xx0_timer,
MACHINE_END