| commit | ce2f6fb8bd8c1e85f288033020dfc31c9fc2be94 | [log] [tgz] |
|---|---|---|
| author | Steve French <sfrench@us.ibm.com> | Tue Nov 02 03:48:02 2010 +0000 |
| committer | Steve French <sfrench@us.ibm.com> | Tue Nov 02 03:48:02 2010 +0000 |
| tree | 4b6365efb0c3b6fc4d5989d7128cbbe815b4ee79 | |
| parent | 50ae28f0144a790fc63a5b89b9aca3ffa9f88522 [diff] | |
| parent | e99d11d19977c74b18411cdb59cdebb788237a6e [diff] |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index cd51a36..57afd4a 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h
@@ -486,7 +486,7 @@ /* 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) {