Skip to content

Commit

Permalink
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve French committed Nov 2, 2010
2 parents 50ae28f + e99d11d commit ce2f6fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/logfs/logfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit ce2f6fb

Please sign in to comment.