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.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-nokia770.c
diff --git
a/arch/arm/mach-omap1/board-nokia770.c
b/arch/arm/mach-omap1/board-nokia770.c
index
8420535
..
02789c5
100644
(file)
--- a/
arch/arm/mach-omap1/board-nokia770.c
+++ b/
arch/arm/mach-omap1/board-nokia770.c
@@
-263,7
+263,7
@@
static void __init omap_nokia770_map_io(void)
}
MACHINE_START(NOKIA770, "Nokia 770")
- .
boot_params = 0x10000
100,
+ .
atag_offset = 0x
100,
.map_io = omap_nokia770_map_io,
.reserve = omap_reserve,
.init_irq = omap_nokia770_init_irq,