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/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
u300.c
diff --git
a/arch/arm/mach-u300/u300.c
b/arch/arm/mach-u300/u300.c
index
48b3b7f
..
80e7305
100644
(file)
--- a/
arch/arm/mach-u300/u300.c
+++ b/
arch/arm/mach-u300/u300.c
@@
-61,7
+61,7
@@
static void __init u300_init_machine(void)
MACHINE_START(U300, MACH_U300_STRING)
/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
- .
boot_params
= BOOT_PARAMS_OFFSET,
+ .
atag_offset
= BOOT_PARAMS_OFFSET,
.map_io = u300_map_io,
.reserve = u300_reserve,
.init_irq = u300_init_irq,