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/fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-eukrea_cpuimx25.c
diff --git
a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index
2442d5d
..
9163318
100644
(file)
--- a/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@
-163,7
+163,7
@@
static struct sys_timer eukrea_cpuimx25_timer = {
MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
/* Maintainer: Eukrea Electromatique */
- .
boot_params = MX25_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx25_map_io,
.init_early = imx25_init_early,
.init_irq = mx25_init_irq,