aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/cpu-exynos4.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /arch/arm/mach-exynos/cpu-exynos4.c
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'arch/arm/mach-exynos/cpu-exynos4.c')
-rw-r--r--arch/arm/mach-exynos/cpu-exynos4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/cpu-exynos4.c b/arch/arm/mach-exynos/cpu-exynos4.c
index ffd9387..7f2245e 100644
--- a/arch/arm/mach-exynos/cpu-exynos4.c
+++ b/arch/arm/mach-exynos/cpu-exynos4.c
@@ -287,7 +287,7 @@ void __init exynos4_map_io(void)
s3c_i2c2_setname("s3c2440-i2c");
#ifdef CONFIG_S5P_DEV_ACE
- s5p_ace_setname("exynos4-ace");
+ s5p_ace_setname("exynos-ace");
#endif
}