From: Adrian Bunk <bunk@stusta.de>

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@osdl.org>
---

 fs/nfs/super.c             |    1 +
 include/linux/nfsd/const.h |    4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff -puN fs/nfs/super.c~include-linux-nfsd-consth-remove-nfs_super_magic fs/nfs/super.c
--- a/fs/nfs/super.c~include-linux-nfsd-consth-remove-nfs_super_magic
+++ a/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 -puN include/linux/nfsd/const.h~include-linux-nfsd-consth-remove-nfs_super_magic include/linux/nfsd/const.h
--- a/include/linux/nfsd/const.h~include-linux-nfsd-consth-remove-nfs_super_magic
+++ a/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
_