diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-imx/mach-pcm043.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm043.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pcm043.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 660ec3e80cf8..0a4d31de7738 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c | |||
| @@ -418,7 +418,7 @@ struct sys_timer pcm043_timer = { | |||
| 418 | 418 | ||
| 419 | MACHINE_START(PCM043, "Phytec Phycore pcm043") | 419 | MACHINE_START(PCM043, "Phytec Phycore pcm043") |
| 420 | /* Maintainer: Pengutronix */ | 420 | /* Maintainer: Pengutronix */ |
| 421 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 421 | .atag_offset = 0x100, |
| 422 | .map_io = mx35_map_io, | 422 | .map_io = mx35_map_io, |
| 423 | .init_early = imx35_init_early, | 423 | .init_early = imx35_init_early, |
| 424 | .init_irq = mx35_init_irq, | 424 | .init_irq = mx35_init_irq, |