diff --git a/[refs] b/[refs]
index 9e90ddef35bc..c10ec5747eb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb6e071f845d32545e3e943058012f328a2e95ad
+refs/heads/master: 0add3e8567a42b8137e26c0595a59f893d8592e0
diff --git a/trunk/fs/nfs/nfs4_fs.h b/trunk/fs/nfs/nfs4_fs.h
index b1ecacd8784a..5511690de8a5 100644
--- a/trunk/fs/nfs/nfs4_fs.h
+++ b/trunk/fs/nfs/nfs4_fs.h
@@ -380,7 +380,7 @@ static inline int nfs4_register_sysctl(void)
 	return 0;
 }
 
-static inline int nfs4_unregister_sysctl(void)
+static inline void nfs4_unregister_sysctl(void)
 {
 }
 #endif