include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
PATCH 1/1 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 <[email protected]>
---
This patch was already sent on:
- 28 Nov 2006
fs/nfs/super.c | 1 + include/linux/nfsd/const.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
include/linux/nfsd/const.h renamed from include/linux/nfsd/const.h.old +0 -4
@@ -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
fs/nfs/super.c renamed from fs/nfs/super.c.old +1 -0
@@ -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>