diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:23 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:32 -0400 |
| commit | 7bfb40b048aa709bb88a00a1acbadbd9f7a645ee (patch) | |
| tree | 88cfef3d3facca564ad378553a838789e0c78cb1 /arch/arm/mach-imx/mach-cpuimx35.c | |
| parent | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge remote-tracking branch 'origin/master' into next
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx35.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx35.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index f39a478ba1a6..4bd083ba9af2 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c | |||
| @@ -192,7 +192,7 @@ struct sys_timer eukrea_cpuimx35_timer = { | |||
| 192 | .init = eukrea_cpuimx35_timer_init, | 192 | .init = eukrea_cpuimx35_timer_init, |
| 193 | }; | 193 | }; |
| 194 | 194 | ||
| 195 | MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35") | 195 | MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35") |
| 196 | /* Maintainer: Eukrea Electromatique */ | 196 | /* Maintainer: Eukrea Electromatique */ |
| 197 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 197 | .boot_params = MX3x_PHYS_OFFSET + 0x100, |
| 198 | .map_io = mx35_map_io, | 198 | .map_io = mx35_map_io, |