diff --git a/[refs] b/[refs]
index a9d1c802d659..d16689b5631f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80d3e8abb73dad3983fef2597b52cab8fbcd876b
+refs/heads/master: 948c28fe3001f2c9d852dff2a0b2c69fe7cec91b
diff --git a/trunk/drivers/char/hvc_vio.c b/trunk/drivers/char/hvc_vio.c
index c72b994652ac..10be343d6ae7 100644
--- a/trunk/drivers/char/hvc_vio.c
+++ b/trunk/drivers/char/hvc_vio.c
@@ -120,7 +120,7 @@ static struct vio_driver hvc_vio_driver = {
 	}
 };
 
-static int hvc_vio_init(void)
+static int __init hvc_vio_init(void)
 {
 	int rc;
 
@@ -134,7 +134,7 @@ static int hvc_vio_init(void)
 }
 module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */
 
-static void hvc_vio_exit(void)
+static void __exit hvc_vio_exit(void)
 {
 	vio_unregister_driver(&hvc_vio_driver);
 }