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 'sh-latest' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx25_3ds.c
diff --git
a/arch/arm/mach-imx/mach-mx25_3ds.c
b/arch/arm/mach-imx/mach-mx25_3ds.c
index
bd735ad
..
88dccf1
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/
arch/arm/mach-imx/mach-mx25_3ds.c
@@
-263,7
+263,7
@@
static struct sys_timer mx25pdk_timer = {
MACHINE_START(MX25_3DS, "Freescale MX25PDK (3DS)")
/* Maintainer: Freescale Semiconductor, Inc. */
- .
boot_params = MX25_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx25_map_io,
.init_early = imx25_init_early,
.init_irq = mx25_init_irq,