projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6-block.git]
/
fs
/
minix
/
file.c
diff --git
a/fs/minix/file.c
b/fs/minix/file.c
index f92baa1d757053cd7f1b3964bf73cafcd74f7047..17765f697e50f68f7a29906b8f4aef36709abb29 100644
(file)
--- a/
fs/minix/file.c
+++ b/
fs/minix/file.c
@@
-23,7
+23,7
@@
const struct file_operations minix_file_operations = {
.aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
.fsync = minix_sync_file,
- .s
endfile = generic_file_sendfile
,
+ .s
plice_read = generic_file_splice_read
,
};
const struct inode_operations minix_file_inode_operations = {