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

2010-11-02 03:48:02 +00:00 · 2010-11-02 03:48:02 +00:00 · ce2f6fb8bd
--- 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)
 {