diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
| commit | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch) | |
| tree | 2e0051ccb147b0553d50c14681c50881098859d6 /fs/jffs/jffs_fm.c | |
| parent | e89dc9209692293434da45ec31826a55becb91c0 (diff) | |
| parent | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/jffs/jffs_fm.c')
| -rw-r--r-- | fs/jffs/jffs_fm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c index 053e3a98a276..6da13b309bd1 100644 --- a/fs/jffs/jffs_fm.c +++ b/fs/jffs/jffs_fm.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/blkdev.h> | 20 | #include <linux/blkdev.h> |
| 21 | #include <linux/jffs.h> | 21 | #include <linux/jffs.h> |
| 22 | #include "jffs_fm.h" | 22 | #include "jffs_fm.h" |
| 23 | #include "intrep.h" | ||
| 23 | 24 | ||
| 24 | #if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE | 25 | #if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE |
| 25 | static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset); | 26 | static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset); |