summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-11-02 04:48:02 +0100
committerSteve French <sfrench@us.ibm.com>2010-11-02 04:48:02 +0100
commitce2f6fb8bd8c1e85f288033020dfc31c9fc2be94 (patch)
tree4b6365efb0c3b6fc4d5989d7128cbbe815b4ee79
parentFS: cifs, remove unneeded NULL tests (diff)
parentfs: logfs: Fix up MTD=y build. (diff)
downloadlinux-ce2f6fb8bd8c1e85f288033020dfc31c9fc2be94.tar.xz
linux-ce2f6fb8bd8c1e85f288033020dfc31c9fc2be94.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
-rw-r--r--fs/logfs/logfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index cd51a36b37f0..57afd4a6fabb 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -486,7 +486,7 @@ static inline int logfs_get_sb_bdev(struct logfs_super *s,
/* dev_mtd.c */
#ifdef CONFIG_MTD
-int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
+int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr);
#else
static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
{