Merge branch 'topic/msnd' into for-linus

[sfrench/cifs-2.6.git] / fs / qnx4 / file.c

diff --git a/fs/qnx4/file.c b/fs/qnx4/file.c
index 467e5ac7280e739eb65a3ee63267ef5e46fbef20..867f42b02035dd6621f681a6730d90c2a3a3c4ae 100644 (file)
--- a/fs/qnx4/file.c
+++ b/fs/qnx4/file.c
@@ -25,7 +25,7 @@ const struct file_operations qnx4_file_operations =
        .read           = do_sync_read,
        .aio_read       = generic_file_aio_read,
        .mmap           = generic_file_mmap,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
 #ifdef CONFIG_QNX4FS_RW
        .write          = do_sync_write,
        .aio_write      = generic_file_aio_write,
@@ -33,7 +33,7 @@ const struct file_operations qnx4_file_operations =
 #endif
 };
 
-struct inode_operations qnx4_file_inode_operations =
+const struct inode_operations qnx4_file_inode_operations =
 {
 #ifdef CONFIG_QNX4FS_RW
        .truncate       = qnx4_truncate,