Merge branch 'fixes-rc1' into fixes

[linux-2.6-microblaze.git] / fs / jffs2 / file.c

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index f8fb89b..4fc8cd6 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -57,6 +57,7 @@ const struct file_operations jffs2_file_operations =
        .mmap =         generic_file_readonly_mmap,
        .fsync =        jffs2_fsync,
        .splice_read =  generic_file_splice_read,
+       .splice_write = iter_file_splice_write,
 };
 
 /* jffs2_file_inode_operations */