Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 77f1f67a1a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 1 additions and 4 deletions Side-by-side Diff

... ... @@ -44,6 +44,7 @@
44 44 #include <linux/vfs.h>
45 45 #include <linux/inet.h>
46 46 #include <linux/nfs_xdr.h>
  47 +#include <linux/magic.h>
47 48  
48 49 #include <asm/system.h>
49 50 #include <asm/uaccess.h>
include/linux/nfsd/const.h
Diff comments   View file @ b5d5dfb
... ... @@ -30,10 +30,6 @@
30 30  
31 31 #include <linux/sunrpc/msg_prot.h>
32 32  
33   -#ifndef NFS_SUPER_MAGIC
34   -# define NFS_SUPER_MAGIC 0x6969
35   -#endif
36   -
37 33 /*
38 34 * Largest number of bytes we need to allocate for an NFS
39 35 * call or reply. Used to control buffer sizes. We use