From 373274de281ce5eff2fc80e7a3d3c491449f32d5 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 28 May 2010 19:21:11 +0900
Subject: [PATCH] --- yaml --- r: 199231 b: refs/heads/master c:
 5d66ceee78f74ca52661634f6f822a99cf406974 h: refs/heads/master i:   199229:
 4169ce1ea0383fe6f636f59b89dc932322cac1b4   199227:
 2bf4d28defee003b8017b66c8b9f7fa562e4af67   199223:
 a4d5c920dfb19e73b30c881451aa5afc62811487   199215:
 c61fd8b015af21e53c1c2b7519da9acf9e5dbad0   199199:
 41ff4b51944e8d8ab0b8dd4cfdde0891178d7f3b   199167:
 6c417326ddc34373facf23a5b4c7f6bdd4fa65f8 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/serial/s5pv210.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2803783be592..85c779c0facd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece8ae4932703b37ea01222ea3e969a26692c871
+refs/heads/master: 5d66ceee78f74ca52661634f6f822a99cf406974
diff --git a/trunk/drivers/serial/s5pv210.c b/trunk/drivers/serial/s5pv210.c
index 8dc03837617b..4a789e5361a4 100644
--- a/trunk/drivers/serial/s5pv210.c
+++ b/trunk/drivers/serial/s5pv210.c
@@ -119,7 +119,7 @@ static int s5p_serial_probe(struct platform_device *pdev)
 	return s3c24xx_serial_probe(pdev, s5p_uart_inf[pdev->id]);
 }
 
-static struct platform_driver s5p_serial_drv = {
+static struct platform_driver s5p_serial_driver = {
 	.probe		= s5p_serial_probe,
 	.remove		= __devexit_p(s3c24xx_serial_remove),
 	.driver		= {
@@ -130,19 +130,19 @@ static struct platform_driver s5p_serial_drv = {
 
 static int __init s5pv210_serial_console_init(void)
 {
-	return s3c24xx_serial_initconsole(&s5p_serial_drv, s5p_uart_inf);
+	return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
 }
 
 console_initcall(s5pv210_serial_console_init);
 
 static int __init s5p_serial_init(void)
 {
-	return s3c24xx_serial_init(&s5p_serial_drv, *s5p_uart_inf);
+	return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
 }
 
 static void __exit s5p_serial_exit(void)
 {
-	platform_driver_unregister(&s5p_serial_drv);
+	platform_driver_unregister(&s5p_serial_driver);
 }
 
 module_init(s5p_serial_init);