Commit ce2f6fb8 authored by Steve French's avatar Steve French
Browse files

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

parents 50ae28f0 e99d11d1

fs/logfs/logfs.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE