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/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx31ads.c
diff --git
a/arch/arm/mach-imx/mach-mx31ads.c
b/arch/arm/mach-imx/mach-mx31ads.c
index
29ca890
..
910c456
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx31ads.c
+++ b/
arch/arm/mach-imx/mach-mx31ads.c
@@
-535,7
+535,7
@@
static struct sys_timer mx31ads_timer = {
MACHINE_START(MX31ADS, "Freescale MX31ADS")
/* Maintainer: Freescale Semiconductor, Inc. */
- .
boot_params = MX3x_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx31ads_map_io,
.init_early = imx31_init_early,
.init_irq = mx31ads_init_irq,