diff options
| author | Michal Marek <mmarek@suse.com> | 2015-10-27 14:02:24 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-11-25 11:23:25 +0100 |
| commit | cf4f21938e13ea1533ebdcb21c46f1d998a44ee8 (patch) | |
| tree | b26af8415bc9f916124e27b4bbfd3209270e40f6 /fs/logfs | |
| parent | 0046a46a8f93f5b99b499118779521ba3b017d69 (diff) | |
| download | linux-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.tar.bz2 | |
kbuild: Allow to specify composite modules with modname-m
This allows to write
drm-$(CONFIG_AGP) += drm_agpsupport.o
without having to handle CONFIG_AGP=y vs. CONFIG_AGP=m. Only support
this syntax for modules, since built-in code depending on something
modular cannot work and init/Makefile actually relies on the current
semantics. There are a few drivers which adapted to the current
semantics out of necessity; these are fixed to also work when the
respective subsystem is modular.
Acked-by: Peter Chen <peter.chen@freescale.com> [chipidea]
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'fs/logfs')
| -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 5f0937609465..23f961a8fb92 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) |