Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / fs / bfs / file.c

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index a9164a87f8deebfee1ceefd1f722bb0baac75491..24310e9ee05ad343245c0d9e881f150006c8e69f 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -24,7 +24,7 @@ const struct file_operations bfs_file_operations = {
        .write          = do_sync_write,
        .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
-       .sendfile       = generic_file_sendfile,
+       .splice_read    = generic_file_splice_read,
 };
 
 static int bfs_move_block(unsigned long from, unsigned long to, struct super_block *sb)
@@ -164,4 +164,4 @@ const struct address_space_operations bfs_aops = {
        .bmap           = bfs_bmap,
 };
 
-struct inode_operations bfs_file_inops;
+const struct inode_operations bfs_file_inops;