diff --git a/[refs] b/[refs]
index 3c0b4ff830a8..cb60bf2ccb72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef3f2dd4810cca5bf5b1d3648968b50fb267d5e2
+refs/heads/master: 4bc778661a86722b2c1128dd03851fa013ef26de
diff --git a/trunk/arch/arm/mach-s3c2416/s3c2416.c b/trunk/arch/arm/mach-s3c2416/s3c2416.c
index 620718939628..63f39cdc0972 100644
--- a/trunk/arch/arm/mach-s3c2416/s3c2416.c
+++ b/trunk/arch/arm/mach-s3c2416/s3c2416.c
@@ -101,7 +101,7 @@ void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
 
-	s3c_nand_setname("s3c2416-nand");
+	s3c_nand_setname("s3c2412-nand");
 }
 
 /* s3c2416_map_io