diff --git a/[refs] b/[refs]
index 1fe204be9f83..4e5af589c9ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f15364bd4cf8799a7677b6daeed7b67d9139d974
+refs/heads/master: 065f30ec14b1460c695b371bc44e068832a60d9b
diff --git a/trunk/fs/nfs/symlink.c b/trunk/fs/nfs/symlink.c
index 83e865a16ad1..412738dbfbc7 100644
--- a/trunk/fs/nfs/symlink.c
+++ b/trunk/fs/nfs/symlink.c
@@ -10,7 +10,6 @@
  *  nfs symlink handling code
  */
 
-#define NFS_NEED_XDR_TYPES
 #include <linux/time.h>
 #include <linux/errno.h>
 #include <linux/sunrpc/clnt.h>
diff --git a/trunk/include/linux/nfs3.h b/trunk/include/linux/nfs3.h
index 7f11fa589207..539f3b550eab 100644
--- a/trunk/include/linux/nfs3.h
+++ b/trunk/include/linux/nfs3.h
@@ -96,7 +96,7 @@ struct nfs3_fh {
 #define MOUNTPROC3_UMNTALL	4
  
 
-#if defined(__KERNEL__) || defined(NFS_NEED_KERNEL_TYPES)
+#if defined(__KERNEL__)
 
 /* Number of 32bit words in post_op_attr */
 #define NFS3_POST_OP_ATTR_WORDS		22