diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /fs/jffs/jffs_fm.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs/jffs_fm.c')
| -rw-r--r-- | fs/jffs/jffs_fm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c index 6aab317f56e0..5a95fbdd6fdb 100644 --- a/fs/jffs/jffs_fm.c +++ b/fs/jffs/jffs_fm.c | |||
| @@ -30,8 +30,8 @@ static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset); | |||
| 30 | static struct jffs_fm *jffs_alloc_fm(void); | 30 | static struct jffs_fm *jffs_alloc_fm(void); |
| 31 | static void jffs_free_fm(struct jffs_fm *n); | 31 | static void jffs_free_fm(struct jffs_fm *n); |
| 32 | 32 | ||
| 33 | extern kmem_cache_t *fm_cache; | 33 | extern struct kmem_cache *fm_cache; |
| 34 | extern kmem_cache_t *node_cache; | 34 | extern struct kmem_cache *node_cache; |
| 35 | 35 | ||
| 36 | #if CONFIG_JFFS_FS_VERBOSE > 0 | 36 | #if CONFIG_JFFS_FS_VERBOSE > 0 |
| 37 | void | 37 | void |