From d9cb189059dae2b9d769d7c074069dd433eb3ece Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 23 Apr 2013 23:40:55 +0000
Subject: [PATCH] --- yaml --- r: 369887 b: refs/heads/master c:
 22ee3b57c3ff71772b0c4178404b04f5df78d501 h: refs/heads/master i:   369885:
 e0bfcb3e1b977353d070372c1c6cf2815dac7ca7   369883:
 af8b35f2ffd05733ed076b46094187c2870a3dfa   369879:
 1172ba67b7b150dc5afe40327a39741bbf5c7b30   369871:
 857aa0fcd1b93f8c936ed33fc4c862423b7f2dc0   369855:
 8c080dada9ac451ef1a25943e676534b715c9424 v: v3

---
 [refs]                         | 2 +-
 trunk/net/vmw_vsock/af_vsock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0e723a77f0b4..71f0dd65858e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ad0b2f7fdfd95fe3107367f8aed252e94c3f654
+refs/heads/master: 22ee3b57c3ff71772b0c4178404b04f5df78d501
diff --git a/trunk/net/vmw_vsock/af_vsock.c b/trunk/net/vmw_vsock/af_vsock.c
index 4b4db18ba92c..3f77f42a3b58 100644
--- a/trunk/net/vmw_vsock/af_vsock.c
+++ b/trunk/net/vmw_vsock/af_vsock.c
@@ -165,7 +165,7 @@ static struct list_head vsock_bind_table[VSOCK_HASH_SIZE + 1];
 static struct list_head vsock_connected_table[VSOCK_HASH_SIZE];
 static DEFINE_SPINLOCK(vsock_table_lock);
 
-static __init void vsock_init_tables(void)
+static void vsock_init_tables(void)
 {
 	int i;