diff --git a/[refs] b/[refs]
index ffeacfb8a024..fbc28e5a56ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0ad670d7061efad138df19aefe569263c4ea37b
+refs/heads/master: 04826f43d4f0a4d56423eb8abb9f2ec9987df5b5
diff --git a/trunk/include/linux/nfsd/cache.h b/trunk/include/linux/nfsd/cache.h
index a59a2df6d079..5bccaab81056 100644
--- a/trunk/include/linux/nfsd/cache.h
+++ b/trunk/include/linux/nfsd/cache.h
@@ -75,6 +75,13 @@ int	nfsd_reply_cache_init(void);
 void	nfsd_reply_cache_shutdown(void);
 int	nfsd_cache_lookup(struct svc_rqst *, int);
 void	nfsd_cache_update(struct svc_rqst *, int, __be32 *);
+
+#ifdef CONFIG_NFSD_V4
 void	nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
+#else  /* CONFIG_NFSD_V4 */
+static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
+{
+}
+#endif /* CONFIG_NFSD_V4 */
 
 #endif /* NFSCACHE_H */