diff --git a/[refs] b/[refs]
index 1b99c6ad25c1..a8abd23b243b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 436c3878418ff484ce852c82847b238ef3f73341
+refs/heads/master: 2cf0c58ed970b91e620e551d4c8da8b1d0baab49
diff --git a/trunk/drivers/serial/samsung.c b/trunk/drivers/serial/samsung.c
index 7ac2bf5167cd..2335edafe903 100644
--- a/trunk/drivers/serial/samsung.c
+++ b/trunk/drivers/serial/samsung.c
@@ -883,10 +883,10 @@ static struct uart_ops s3c24xx_serial_ops = {
 
 static struct uart_driver s3c24xx_uart_drv = {
 	.owner		= THIS_MODULE,
-	.dev_name	= "s3c2410_serial",
+	.driver_name	= "s3c2410_serial",
 	.nr		= CONFIG_SERIAL_SAMSUNG_UARTS,
 	.cons		= S3C24XX_SERIAL_CONSOLE,
-	.driver_name	= S3C24XX_SERIAL_NAME,
+	.dev_name	= S3C24XX_SERIAL_NAME,
 	.major		= S3C24XX_SERIAL_MAJOR,
 	.minor		= S3C24XX_SERIAL_MINOR,
 };