git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
fs
/
ramfs
/
file-mmu.c
diff --git
a/fs/ramfs/file-mmu.c
b/fs/ramfs/file-mmu.c
index 2f14774a124fc05e5c995f1c9dd02926440de009..97bdc0b2f9d29b0d253048874dfaa388ae3ec830 100644
(file)
--- a/
fs/ramfs/file-mmu.c
+++ b/
fs/ramfs/file-mmu.c
@@
-41,7
+41,7
@@
const struct file_operations ramfs_file_operations = {
.aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
.fsync = simple_sync_file,
- .s
endfile = generic_file_sendfile
,
+ .s
plice_read = generic_file_splice_read
,
.llseek = generic_file_llseek,
};