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 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-dove
/
dove-db-setup.c
diff --git
a/arch/arm/mach-dove/dove-db-setup.c
b/arch/arm/mach-dove/dove-db-setup.c
index 95925aa76dd9483fe2c556e706981530b85f9627..2ac34ecfa7453596f1f693caa62adf9545c1dfaa 100644
(file)
--- a/
arch/arm/mach-dove/dove-db-setup.c
+++ b/
arch/arm/mach-dove/dove-db-setup.c
@@
-97,6
+97,7
@@
MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")
.boot_params = 0x00000100,
.init_machine = dove_db_init,
.map_io = dove_map_io,
+ .init_early = dove_init_early,
.init_irq = dove_init_irq,
.timer = &dove_timer,
MACHINE_END