diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 22:45:16 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 22:45:16 +0200 |
| commit | 4722cd7741c6404f967f7a7b8b666540b6c1663e (patch) | |
| tree | 877b7d8efe1e4e4ce48416186b4f45da3a5fccac /arch/arm/mach-imx/mach-eukrea_cpuimx25.c | |
| parent | Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux in... (diff) | |
| parent | Merge branches 'hwbreak', 'perf/updates' and 'perf/system-pmus' into for-rmk (diff) | |
| download | linux-4722cd7741c6404f967f7a7b8b666540b6c1663e.tar.xz linux-4722cd7741c6404f967f7a7b8b666540b6c1663e.zip | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
Diffstat (limited to 'arch/arm/mach-imx/mach-eukrea_cpuimx25.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c index d8699b54268d..9163318e95a2 100644 --- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c +++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c @@ -161,7 +161,7 @@ static struct sys_timer eukrea_cpuimx25_timer = { .init = eukrea_cpuimx25_timer_init, }; -MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25") +MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25") /* Maintainer: Eukrea Electromatique */ .atag_offset = 0x100, .map_io = mx25_map_io, |