diff --git a/[refs] b/[refs]
index 56b0023216a7..a27fa53d7a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3187cedf158687432cdf152eeee205f7b149f4ef
+refs/heads/master: 9e87b1e53f3c72c1196dc22cb359b5d6188a3729
diff --git a/trunk/include/linux/nfsd/nfsfh.h b/trunk/include/linux/nfsd/nfsfh.h
index b2e093870bc6..fa317f6c154b 100644
--- a/trunk/include/linux/nfsd/nfsfh.h
+++ b/trunk/include/linux/nfsd/nfsfh.h
@@ -14,9 +14,8 @@
 #ifndef _LINUX_NFSD_FH_H
 #define _LINUX_NFSD_FH_H
 
-#include <asm/types.h>
-#ifdef __KERNEL__
 # include <linux/types.h>
+#ifdef __KERNEL__
 # include <linux/string.h>
 # include <linux/fs.h>
 #endif