diff --git a/[refs] b/[refs]
index 09c42ef7ffae..490b54879d11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8138a274d81d87591db0803b1e81f4284ff935
+refs/heads/master: 1f69f172c73a2bf0bf55da9346da8dccea9035cf
diff --git a/trunk/fs/nfsd/auth.h b/trunk/fs/nfsd/auth.h
index 0fb9f7212195..78b3c0e93822 100644
--- a/trunk/fs/nfsd/auth.h
+++ b/trunk/fs/nfsd/auth.h
@@ -1,6 +1,4 @@
 /*
- * include/linux/nfsd/auth.h
- *
  * nfsd-specific authentication stuff.
  * uid/gid mapping not yet implemented.
  *
@@ -10,8 +8,6 @@
 #ifndef LINUX_NFSD_AUTH_H
 #define LINUX_NFSD_AUTH_H
 
-#ifdef __KERNEL__
-
 #define nfsd_luid(rq, uid)	((u32)(uid))
 #define nfsd_lgid(rq, gid)	((u32)(gid))
 #define nfsd_ruid(rq, uid)	((u32)(uid))
@@ -23,5 +19,4 @@
  */
 int nfsd_setuser(struct svc_rqst *, struct svc_export *);
 
-#endif /* __KERNEL__ */
 #endif /* LINUX_NFSD_AUTH_H */