diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /fs/jffs2/file.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/jffs2/file.c')
| -rw-r--r-- | fs/jffs2/file.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index bd9ed9b0247b..8279bf0133ff 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c | |||
| @@ -21,9 +21,6 @@ | |||
| 21 | #include <linux/jffs2.h> | 21 | #include <linux/jffs2.h> |
| 22 | #include "nodelist.h" | 22 | #include "nodelist.h" |
| 23 | 23 | ||
| 24 | extern int generic_file_open(struct inode *, struct file *) __attribute__((weak)); | ||
| 25 | extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin) __attribute__((weak)); | ||
| 26 | |||
| 27 | static int jffs2_commit_write (struct file *filp, struct page *pg, | 24 | static int jffs2_commit_write (struct file *filp, struct page *pg, |
| 28 | unsigned start, unsigned end); | 25 | unsigned start, unsigned end); |
| 29 | static int jffs2_prepare_write (struct file *filp, struct page *pg, | 26 | static int jffs2_prepare_write (struct file *filp, struct page *pg, |