Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

ce2f6fb8 · Steve French · 50ae28f0 · e99d11d1 · ce2f6fb8
Commit ce2f6fb8 authored Nov 02, 2010 by Steve French
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fs/logfs/logfs.h fs/logfs/logfs.h +1 -1

No files found.
--- 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)
 {