summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAdrian Bunk2007-02-12 09:53:40 +0100
committerLinus Torvalds2007-02-12 18:48:36 +0100
commitb5d5dfbd59577aed72263f22e28d3eaf98e1c6e5 (patch)
tree9ef320c6ff4f61bffb25c0452570d5f76ab7769c /fs/nfs
parent[PATCH] knfsd: SUNRPC: fix up svc_create_socket() to take a sockaddr struct +... (diff)
downloadkernel-qcow2-linux-b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5.tar.gz
kernel-qcow2-linux-b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5.tar.xz
kernel-qcow2-linux-b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5.zip
[PATCH] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
NFS_SUPER_MAGIC is already defined in include/linux/magic.h Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 28108c82b887..76b980097621 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -44,6 +44,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
#include <linux/nfs_xdr.h>
+#include <linux/magic.h>
#include <asm/system.h>
#include <asm/uaccess.h>