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 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
d2net_v2-setup.c
diff --git
a/arch/arm/mach-kirkwood/d2net_v2-setup.c
b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index
043cfd5
..
f457e07
100644
(file)
--- a/
arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/
arch/arm/mach-kirkwood/d2net_v2-setup.c
@@
-221,7
+221,7
@@
static void __init d2net_v2_init(void)
}
MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = d2net_v2_init,
.map_io = kirkwood_map_io,
.init_early = kirkwood_init_early,