diff --git a/[refs] b/[refs]
index 55818778cd01..2d4b8ba38cd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d3aac04175c35564cc5982934b68bc4f89a76d
+refs/heads/master: 240ee831187e000704cba3208ef6b0a8ad49bd64
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index ef57a5ae5904..5d2e9d9a4e28 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -64,7 +64,11 @@ const struct file_operations nfs_file_operations = {
 	.write		= do_sync_write,
 	.aio_read	= nfs_file_read,
 	.aio_write	= nfs_file_write,
+#ifdef CONFIG_MMU
 	.mmap		= nfs_file_mmap,
+#else
+	.mmap		= generic_file_mmap,
+#endif
 	.open		= nfs_file_open,
 	.flush		= nfs_file_flush,
 	.release	= nfs_file_release,