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-netx
/
nxdb500.c
diff --git
a/arch/arm/mach-netx/nxdb500.c
b/arch/arm/mach-netx/nxdb500.c
index
ca8b203
..
90903dd
100644
(file)
--- a/
arch/arm/mach-netx/nxdb500.c
+++ b/
arch/arm/mach-netx/nxdb500.c
@@
-200,7
+200,7
@@
static void __init nxdb500_init(void)
}
MACHINE_START(NXDB500, "Hilscher nxdb500")
}
MACHINE_START(NXDB500, "Hilscher nxdb500")
- .
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,