summaryrefslogtreecommitdiffstats
path: root/include/linux/nfsd/nfsfh.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 10:47:46 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 10:47:46 +0000
commit41966710ab574f1fcedf3e10e1ceef911c096d1d (patch)
treea370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/linux/nfsd/nfsfh.h
parent4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff)
parent1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff)
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/linux/nfsd/nfsfh.h')
-rw-r--r--include/linux/nfsd/nfsfh.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index f76d80ccec1..ce4743a2601 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -14,11 +14,14 @@
#ifndef _LINUX_NFSD_FH_H
#define _LINUX_NFSD_FH_H
-# include <linux/types.h>
+#include <linux/types.h>
+#include <linux/nfs.h>
+#include <linux/nfs2.h>
+#include <linux/nfs3.h>
+#include <linux/nfs4.h>
#ifdef __KERNEL__
# include <linux/sunrpc/svc.h>
#endif
-#include <linux/nfsd/const.h>
/*
* This is the old "dentry style" Linux NFSv2 file handle.