Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[cascardo/linux.git] / include / linux / nfsd / const.h

diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h
index f478066..323f8cf 100644 (file)
--- a/include/linux/nfsd/const.h
+++ b/include/linux/nfsd/const.h
@@ -13,7 +13,6 @@
 #include <linux/nfs2.h>
 #include <linux/nfs3.h>
 #include <linux/nfs4.h>
-#include <linux/sunrpc/msg_prot.h>
 
 /*
  * Maximum protocol version supported by knfsd
@@ -29,9 +28,7 @@
 
 #ifdef __KERNEL__
 
-#ifndef NFS_SUPER_MAGIC
-# define NFS_SUPER_MAGIC       0x6969
-#endif
+#include <linux/sunrpc/msg_prot.h>
 
 /*
  * Largest number of bytes we need to allocate for an NFS