Commit ce2f6fb8 authored by Steve French's avatar Steve French

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

parents 50ae28f0 e99d11d1
...@@ -486,7 +486,7 @@ static inline int logfs_get_sb_bdev(struct logfs_super *s, ...@@ -486,7 +486,7 @@ static inline int logfs_get_sb_bdev(struct logfs_super *s,
/* dev_mtd.c */ /* dev_mtd.c */
#ifdef CONFIG_MTD #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 #else
static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr) static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment