[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>
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 28108c8..76b9800 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>
diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h
index f0cc777..323f8cf 100644
--- a/include/linux/nfsd/const.h
+++ b/include/linux/nfsd/const.h
@@ -30,10 +30,6 @@
#include <linux/sunrpc/msg_prot.h>
-#ifndef NFS_SUPER_MAGIC
-# define NFS_SUPER_MAGIC 0x6969
-#endif
-
/*
* Largest number of bytes we need to allocate for an NFS
* call or reply. Used to control buffer sizes. We use