diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:15:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:15:55 +0200 |
| commit | da1c5afee092a2b51136ac3bf20c68bfff2924be (patch) | |
| tree | fa71b9e3af25c870012a22e4cb72547f9aafcfd0 /arch/arm/mach-imx/mach-cpuimx35.c | |
| parent | 1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (diff) | |
| parent | 4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (diff) | |
Merge branch 'samsung/cleanup' into next/cleanup
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 13b704120f07..d69807422847 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 = { .init = eukrea_cpuimx35_timer_init, }; -MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35") +MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35") /* Maintainer: Eukrea Electromatique */ .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = mx35_map_io, |