Merge branch 'for-2.6.23' into merge

[linux.git] / fs / adfs / file.c

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 6101ea679cb1bf7772ba5da5342d7fb6def023ee..36e381c6a99a69a761973cf3e61c38f226e00ee3 100644 (file)
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -33,9 +33,9 @@ const struct file_operations adfs_file_operations = {
        .fsync          = file_fsync,
        .write          = do_sync_write,
        .aio_write      = generic_file_aio_write,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
 };
 
-struct inode_operations adfs_file_inode_operations = {
+const struct inode_operations adfs_file_inode_operations = {
        .setattr        = adfs_notify_change,
 };