Merge branch 'master'

[linux-2.6-omap-h63xx.git] / fs / freevxfs / vxfs_immed.c

diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c
index b20c3efa364be0c07263b738d74b413f54e0f988..d0401dc68d41306cef3781de18e9ac18ef7ad306 100644 (file)
--- a/fs/freevxfs/vxfs_immed.c
+++ b/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);