diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 10:18:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-11 10:18:18 -0700 |
| commit | 200d481f28be4522464bb849dd0eb5f8cb6be781 (patch) | |
| tree | 8cd00ead1b202dfd377cf34000a5193959aa2e8b /fs/jffs2/file.c | |
| parent | f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c (diff) | |
| parent | 97f927a4d7dbccde0a854a62c3ea54d90bae8679 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Diffstat (limited to 'fs/jffs2/file.c')
| -rw-r--r-- | fs/jffs2/file.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 771a554701d..bd9ed9b0247 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -7,11 +7,10 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: file.c,v 1.99 2004/11/16 20:36:11 dwmw2 Exp $ + * $Id: file.c,v 1.102 2005/07/06 12:13:09 dwmw2 Exp $ * */ -#include <linux/version.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/fs.h> @@ -51,9 +50,7 @@ struct file_operations jffs2_file_operations = .ioctl = jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,29) .sendfile = generic_file_sendfile -#endif }; /* jffs2_file_inode_operations */ |