diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 09:45:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 09:45:43 -0800 |
commit | d9569f003cfc0228e132749ae6fd81cb29dc6c70 (patch) | |
tree | 13700ad267a40c318a8d36356c8f5b25e98854fb /fs | |
parent | 0cf0305fffcf8df0998b70d0e922b7a3a5976182 (diff) | |
parent | 7599ea8b4e25fd8dea26cb64f100cf265d1e6bf3 (diff) | |
download | linux-stable-d9569f003cfc0228e132749ae6fd81cb29dc6c70.tar.gz linux-stable-d9569f003cfc0228e132749ae6fd81cb29dc6c70.tar.bz2 linux-stable-d9569f003cfc0228e132749ae6fd81cb29dc6c70.zip |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
- Make <modname>-m in makefiles work like <modname>-y and fix the
fallout
- Minor genksyms fix
- Fix race with make -j install modules_install
- Move -Wsign-compare from make W=1 to W=2
- Other minor fixes
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Demote 'sign-compare' warning to W=2
Makefile: revert "Makefile: Document ability to make file.lst and file.S" partially
kbuild: Do not run modules_install and install in paralel
genksyms: Handle string literals with spaces in reference files
fixdep: constify strrcmp arguments
ath10k: Fix build with CONFIG_THERMAL=m
Revert "drm: Hack around CONFIG_AGP=m build failures"
kbuild: Allow to specify composite modules with modname-m
staging/ad7606: Actually build the interface modules
Diffstat (limited to 'fs')
-rw-r--r-- | fs/logfs/logfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 39d91f86cd35..27d040e35faa 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -485,7 +485,7 @@ static inline int logfs_get_sb_bdev(struct logfs_super *s, #endif /* dev_mtd.c */ -#ifdef CONFIG_MTD +#if IS_ENABLED(CONFIG_MTD) 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) |