Merge branch 'devel'

[~andy/linux] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 742cb745cb47df5e111c99f95434354c66ca4348..3536b01164f9ca036aa102ee5211d670273f26df 100644 (file)
--- a/fs/nfs/file.c
+++ b/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,