projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm' into devel-stable
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
mach-mxt_td60.c
diff --git
a/arch/arm/mach-imx/mach-mxt_td60.c
b/arch/arm/mach-imx/mach-mxt_td60.c
index
c85876f
..
5ec3989
100644
(file)
--- a/
arch/arm/mach-imx/mach-mxt_td60.c
+++ b/
arch/arm/mach-imx/mach-mxt_td60.c
@@
-267,7
+267,7
@@
static struct sys_timer mxt_td60_timer = {
MACHINE_START(MXT_TD60, "Maxtrack i-MXT TD60")
/* maintainer: Maxtrack Industrial */
- .
boot_params = MX27_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx27_map_io,
.init_early = imx27_init_early,
.init_irq = mx27_init_irq,