Commit b5d5dfbd authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC

NFS_SUPER_MAGIC is already defined in include/linux/magic.h
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77f1f67a
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/nfs_xdr.h> #include <linux/nfs_xdr.h>
#include <linux/magic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
#include <linux/sunrpc/msg_prot.h> #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 * Largest number of bytes we need to allocate for an NFS
* call or reply. Used to control buffer sizes. We use * call or reply. Used to control buffer sizes. We use
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment