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 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
glantank.c
diff --git
a/arch/arm/mach-iop32x/glantank.c
b/arch/arm/mach-iop32x/glantank.c
index
ceef5d4
..
0edc880
100644
(file)
--- a/
arch/arm/mach-iop32x/glantank.c
+++ b/
arch/arm/mach-iop32x/glantank.c
@@
-207,7
+207,7
@@
static void __init glantank_init_machine(void)
MACHINE_START(GLANTANK, "GLAN Tank")
/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = glantank_map_io,
.init_irq = iop32x_init_irq,
.timer = &glantank_timer,