diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-imx/mach-mx31lilly.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 126913ad106a..e92eaf91a7be 100644 --- 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 = { | |||
| 295 | }; | 295 | }; |
| 296 | 296 | ||
| 297 | MACHINE_START(LILLY1131, "INCO startec LILLY-1131") | 297 | MACHINE_START(LILLY1131, "INCO startec LILLY-1131") |
| 298 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 298 | .atag_offset = 0x100, |
| 299 | .map_io = mx31_map_io, | 299 | .map_io = mx31_map_io, |
| 300 | .init_early = imx31_init_early, | 300 | .init_early = imx31_init_early, |
| 301 | .init_irq = mx31_init_irq, | 301 | .init_irq = mx31_init_irq, |