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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[pandora-kernel.git]
/
arch
/
arm
/
mach-clps711x
/
autcpu12.c
diff --git
a/arch/arm/mach-clps711x/autcpu12.c
b/arch/arm/mach-clps711x/autcpu12.c
index
4a74b2c
..
0276091
100644
(file)
--- a/
arch/arm/mach-clps711x/autcpu12.c
+++ b/
arch/arm/mach-clps711x/autcpu12.c
@@
-64,7
+64,7
@@
void __init autcpu12_map_io(void)
MACHINE_START(AUTCPU12, "autronix autcpu12")
/* Maintainer: Thomas Gleixner */
- .
boot_params = 0xc00
20000,
+ .
atag_offset = 0x
20000,
.map_io = autcpu12_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer,