Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index b4ac9119200e..5b68dd3f191a 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/buffer_head.h>
+#include <linux/exportfs.h>
 #include <linux/vfs.h>
 #include <linux/mnt_namespace.h>
 #include <linux/mount.h>
@@ -526,7 +527,7 @@ static int init_inodecache(void)
                                                          reiserfs_inode_info),
                                                   0, (SLAB_RECLAIM_ACCOUNT|
                                                         SLAB_MEM_SPREAD),
-                                                  init_once, NULL);
+                                                  init_once);
         if (reiserfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;