summaryrefslogtreecommitdiff
path: root/include/linux/nfsd/const.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
commit48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch)
treeda3aa535c98cc0957851354ceb0fbff7482d7a9d /include/linux/nfsd/const.h
parent1a1689344add3333d28d1b5495d8043a3877d01c (diff)
parent4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff)
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'include/linux/nfsd/const.h')
-rw-r--r--include/linux/nfsd/const.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h
index f0cc77790527..323f8cfa060a 100644
--- a/include/linux/nfsd/const.h
+++ b/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