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://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
mach-netx
/
nxdkn.c
diff --git
a/arch/arm/mach-netx/nxdkn.c
b/arch/arm/mach-netx/nxdkn.c
index
d775cbe
..
c63384a
100644
(file)
--- a/
arch/arm/mach-netx/nxdkn.c
+++ b/
arch/arm/mach-netx/nxdkn.c
@@
-93,7
+93,7
@@
static void __init nxdkn_init(void)
}
MACHINE_START(NXDKN, "Hilscher nxdkn")
}
MACHINE_START(NXDKN, "Hilscher nxdkn")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.map_io = netx_map_io,
.init_irq = netx_init_irq,
.timer = &netx_timer,
.map_io = netx_map_io,
.init_irq = netx_init_irq,
.timer = &netx_timer,