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 'next' of git://github.com/kernelslacker/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
rd88f5181l-fxo-setup.c
diff --git
a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index
50aae6f
..
ebd6767
100644
(file)
--- a/
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@
-168,7
+168,7
@@
subsys_initcall(rd88f5181l_fxo_pci_init);
MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design")
/* Maintainer: Nicolas Pitre <nico@marvell.com> */
MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design")
/* Maintainer: Nicolas Pitre <nico@marvell.com> */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = rd88f5181l_fxo_init,
.map_io = orion5x_map_io,
.init_early = orion5x_init_early,
.init_machine = rd88f5181l_fxo_init,
.map_io = orion5x_map_io,
.init_early = orion5x_init_early,