From c3537e9e407a6c9ca469af043bd17d248fd16973 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 12 Feb 2007 00:53:40 -0800
Subject: [PATCH] --- yaml --- r: 47987 b: refs/heads/master c:
 b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5 h: refs/heads/master i:   47985:
 93909419f2fce500f534e06a4c185550fcdaa4ce   47983:
 d441655c6956630b96f5bb3271de23f0345837f7 v: v3

---
 [refs]                           | 2 +-
 trunk/fs/nfs/super.c             | 1 +
 trunk/include/linux/nfsd/const.h | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 44f7c1822c84..8644086573fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77f1f67a1a56defa210c3d8857f3e5eee3990a99
+refs/heads/master: b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 28108c82b887..76b980097621 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -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>
diff --git a/trunk/include/linux/nfsd/const.h b/trunk/include/linux/nfsd/const.h
index f0cc77790527..323f8cfa060a 100644
--- a/trunk/include/linux/nfsd/const.h
+++ b/trunk/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