diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /fs/jffs2 | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 99871279a1ed..c2530197be0c 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c | |||
| @@ -47,7 +47,7 @@ const struct file_operations jffs2_file_operations = | |||
| 47 | .ioctl = jffs2_ioctl, | 47 | .ioctl = jffs2_ioctl, |
| 48 | .mmap = generic_file_readonly_mmap, | 48 | .mmap = generic_file_readonly_mmap, |
| 49 | .fsync = jffs2_fsync, | 49 | .fsync = jffs2_fsync, |
| 50 | .sendfile = generic_file_sendfile | 50 | .splice_read = generic_file_splice_read, |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | /* jffs2_file_inode_operations */ | 53 | /* jffs2_file_inode_operations */ |