diff --git a/[refs] b/[refs]
index 7aa999e1a0a1..d7adaa3d67a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04c0635058256e2f4618139c237e56b5a4bdbb8f
+refs/heads/master: 5a60d0cd4ff227c4c5212898ecbeeaf5662eb5fa
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index a39b4b2b0c50..b00682e57393 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -1045,7 +1045,7 @@ static int __init xlblk_init(void)
 module_init(xlblk_init);
 
 
-static void xlblk_exit(void)
+static void __exit xlblk_exit(void)
 {
 	return xenbus_unregister_driver(&blkfront);
 }