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://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm043.c
diff --git
a/arch/arm/mach-imx/mach-pcm043.c
b/arch/arm/mach-imx/mach-pcm043.c
index
660ec3e
..
0a4d31d
100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm043.c
+++ b/
arch/arm/mach-imx/mach-pcm043.c
@@
-418,7
+418,7
@@
struct sys_timer pcm043_timer = {
MACHINE_START(PCM043, "Phytec Phycore pcm043")
/* Maintainer: Pengutronix */
- .
boot_params = MX3x_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx35_map_io,
.init_early = imx35_init_early,
.init_irq = mx35_init_irq,