From 21b47ecc4951bdb9c31b07bbaf953c8735cef0fa Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 8 Apr 2013 16:13:59 +0930
Subject: [PATCH] --- yaml --- r: 370959 b: refs/heads/master c:
 3826835ab8bb7eac47f14f279df2bd58ec2bb279 h: refs/heads/master i:   370957:
 eae47ee18777f96c3310d0df72b124c5aaf2f152   370955:
 8dee365fec2336b717994679765738b97d304a38   370951:
 dc80db299bab369954c1140b1cc5a2975c2bacf5   370943:
 4a6924e89c4df7a3a2a1324e30ca25955f6c80aa v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/virtio_console.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5e2f8b91f9ed..b2e095831155 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aef76e9c4c616c91233ece9850e89c91f3fd92a
+refs/heads/master: 3826835ab8bb7eac47f14f279df2bd58ec2bb279
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 6d59f166e0e9..f4f31fe88902 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -78,8 +78,8 @@ struct ports_driver_data {
 };
 static struct ports_driver_data pdrvdata;
 
-DEFINE_SPINLOCK(pdrvdata_lock);
-DECLARE_COMPLETION(early_console_added);
+static DEFINE_SPINLOCK(pdrvdata_lock);
+static DECLARE_COMPLETION(early_console_added);
 
 /* This struct holds information that's relevant only for console ports */
 struct console {
@@ -1198,7 +1198,7 @@ int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
 	return hvc_instantiate(0, 0, &hv_ops);
 }
 
-int init_port_console(struct port *port)
+static int init_port_console(struct port *port)
 {
 	int ret;