summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx/cpu.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:23:45 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:23:45 +0100
commit215ed3236a17b748cf75a2c23f50028c95302a42 (patch)
treea1fa16573704a4a1bb646365f5d4c6cd3bb321f9 /arch/arm/plat-s3c24xx/cpu.c
parent0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (diff)
parente6d197a6954c8a9ff85727c31ca61fc1da78628a (diff)
Merge branch 'next-s3c24xx-cpufreq' into next-s3c
Diffstat (limited to 'arch/arm/plat-s3c24xx/cpu.c')
-rw-r--r--arch/arm/plat-s3c24xx/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index 1932b7e0da1..5447e60f393 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -81,7 +81,7 @@ static struct cpu_table cpu_ids[] __initdata = {
.map_io = s3c2410_map_io,
.init_clocks = s3c2410_init_clocks,
.init_uarts = s3c2410_init_uarts,
- .init = s3c2410_init,
+ .init = s3c2410a_init,
.name = name_s3c2410a
},
{