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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
netxbig_v2-setup.c
diff --git
a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
index
6be627d
..
1ba12c4
100644
(file)
--- a/
arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ b/
arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@
-399,7
+399,7
@@
static void __init netxbig_v2_init(void)
#ifdef CONFIG_MACH_NET2BIG_V2
MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")
#ifdef CONFIG_MACH_NET2BIG_V2
MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,
@@
-410,7
+410,7
@@
MACHINE_END
#ifdef CONFIG_MACH_NET5BIG_V2
MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")
#ifdef CONFIG_MACH_NET5BIG_V2
MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,