aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 16:29:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 16:29:22 -0800
commit63f45b80947cb0819673860f6970f483e2cab21d (patch)
tree6b0d46c7da70786c15ee893d8a48aa866ae3742c /fs/jffs
parent[PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc changes) (diff)
parentearlyuserspace/README: fix homonym err (diff)
downloadlinux-dev-63f45b80947cb0819673860f6970f483e2cab21d.tar.xz
linux-dev-63f45b80947cb0819673860f6970f483e2cab21d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'fs/jffs')
-rw-r--r--fs/jffs/jffs_fm.c1
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 @@
#include <linux/blkdev.h>
#include <linux/jffs.h>
#include "jffs_fm.h"
+#include "intrep.h"
#if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE
static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset);