Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[pandora-kernel.git] / fs / sysv / file.c

diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index 47a4b72..589be21 100644 (file)
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -27,10 +27,10 @@ const struct file_operations sysv_file_operations = {
        .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
        .fsync          = sysv_sync_file,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
 };
 
-struct inode_operations sysv_file_inode_operations = {
+const struct inode_operations sysv_file_inode_operations = {
        .truncate       = sysv_truncate,
        .getattr        = sysv_getattr,
 };