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.selinuxproject.org/~jmorris/linux-security
[pandora-kernel.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
2ac34ec
..
11ea34e
100644
(file)
--- a/
arch/arm/mach-dove/dove-db-setup.c
+++ b/
arch/arm/mach-dove/dove-db-setup.c
@@
-94,7
+94,7
@@
static void __init dove_db_init(void)
}
MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")
}
MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = dove_db_init,
.map_io = dove_map_io,
.init_early = dove_init_early,
.init_machine = dove_db_init,
.map_io = dove_map_io,
.init_early = dove_init_early,