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 'picoxcell/soc' into next/soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx31lilly.c
diff --git
a/arch/arm/mach-imx/mach-mx31lilly.c
b/arch/arm/mach-imx/mach-mx31lilly.c
index
070a8d1
..
5defd8e
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx31lilly.c
+++ b/
arch/arm/mach-imx/mach-mx31lilly.c
@@
-295,7
+295,7
@@
static struct sys_timer mx31lilly_timer = {
};
MACHINE_START(LILLY1131, "INCO startec LILLY-1131")
};
MACHINE_START(LILLY1131, "INCO startec LILLY-1131")
- .
boot_params = MX3x_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx31_map_io,
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,
.map_io = mx31_map_io,
.init_early = imx31_init_early,
.init_irq = mx31_init_irq,