Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
@@ -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)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user