diff --git a/[refs] b/[refs]
index c319546e5a9f..973f923d310f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7df2a7beb9cbdd1acfd52200e2de76ec18c90a1
+refs/heads/master: 6c6ad435cae29575ff632d97afedbcc2ce2e3840
diff --git a/trunk/arch/arm/mach-s5p64x0/cpu.c b/trunk/arch/arm/mach-s5p64x0/cpu.c
index fb90a3004e98..0a2d88a4e5e5 100644
--- a/trunk/arch/arm/mach-s5p64x0/cpu.c
+++ b/trunk/arch/arm/mach-s5p64x0/cpu.c
@@ -106,7 +106,7 @@ static void s5p64x0_idle(void)
 void __init s5p6440_map_io(void)
 {
 	/* initialize any device information early */
-	s3c_adc_setname("s3c64x0-adc");
+	s3c_adc_setname("s3c64xx-adc");
 
 	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
 	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
@@ -115,7 +115,7 @@ void __init s5p6440_map_io(void)
 void __init s5p6450_map_io(void)
 {
 	/* initialize any device information early */
-	s3c_adc_setname("s3c64x0-adc");
+	s3c_adc_setname("s3c64xx-adc");
 
 	iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
 	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6440_iodesc));