diff --git a/[refs] b/[refs]
index c55935f96c37..c712904e3820 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aa0a410af8011d557877e558f9ff17c082c6840
+refs/heads/master: 91e56aaedd7ebceacde782a3921fadef4b5d0e1c
diff --git a/trunk/include/linux/nfs_idmap.h b/trunk/include/linux/nfs_idmap.h
index 717fa5019e75..7eed2012d288 100644
--- a/trunk/include/linux/nfs_idmap.h
+++ b/trunk/include/linux/nfs_idmap.h
@@ -69,8 +69,19 @@ struct nfs_server;
 struct nfs_fattr;
 struct nfs4_string;
 
+#ifdef CONFIG_NFS_V4
 int nfs_idmap_init(void);
 void nfs_idmap_quit(void);
+#else
+static inline int nfs_idmap_init(void)
+{
+	return 0;
+}
+
+static inline void nfs_idmap_quit(void)
+{}
+#endif
+
 int nfs_idmap_new(struct nfs_client *);
 void nfs_idmap_delete(struct nfs_client *);