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 'depends/rmk/devel-stable' into next/board
[pandora-kernel.git]
/
arch
/
arm
/
mach-nomadik
/
board-nhk8815.c
diff --git
a/arch/arm/mach-nomadik/board-nhk8815.c
b/arch/arm/mach-nomadik/board-nhk8815.c
index
97d7186
..
0cbb74c
100644
(file)
--- a/
arch/arm/mach-nomadik/board-nhk8815.c
+++ b/
arch/arm/mach-nomadik/board-nhk8815.c
@@
-277,7
+277,7
@@
static void __init nhk8815_platform_init(void)
MACHINE_START(NOMADIK, "NHK8815")
/* Maintainer: ST MicroElectronics */
- .
boot_params
= 0x100,
+ .
atag_offset
= 0x100,
.map_io = cpu8815_map_io,
.init_irq = cpu8815_init_irq,
.timer = &nomadik_timer,