diff --git a/[refs] b/[refs]
index 42b699b25483..2615950c712e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db873896d168217e213902c7163fda7ee798781b
+refs/heads/master: a5ea169c9581553662bb79a1c8c98fed1ee84246
diff --git a/trunk/fs/freevxfs/vxfs_immed.c b/trunk/fs/freevxfs/vxfs_immed.c
index b20c3efa364b..d0401dc68d41 100644
--- a/trunk/fs/freevxfs/vxfs_immed.c
+++ b/trunk/fs/freevxfs/vxfs_immed.c
@@ -72,7 +72,7 @@ struct address_space_operations vxfs_immed_aops = {
  * Returns:
  *   Zero on success, else a negative error code.
  */
-static int
+static void *
 vxfs_immed_follow_link(struct dentry *dp, struct nameidata *np)
 {
 	struct vxfs_inode_info		*vip = VXFS_INO(dp->d_inode);