summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2015-10-27 14:02:24 +0100
committerMichal Marek <mmarek@suse.com>2015-11-25 11:23:25 +0100
commitcf4f21938e13ea1533ebdcb21c46f1d998a44ee8 (patch)
treeb26af8415bc9f916124e27b4bbfd3209270e40f6 /drivers/misc
parent0046a46a8f93f5b99b499118779521ba3b017d69 (diff)
downloadlinux-stable-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.tar.gz
linux-stable-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.tar.bz2
linux-stable-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.zip
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 'drivers/misc')
-rw-r--r--drivers/misc/ibmasm/ibmasm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 9b083448814d..5bd127727d8e 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -211,7 +211,7 @@ void ibmasmfs_unregister(void);
void ibmasmfs_add_sp(struct service_processor *sp);
/* uart */
-#ifdef CONFIG_SERIAL_8250
+#if IS_ENABLED(CONFIG_SERIAL_8250)
void ibmasm_register_uart(struct service_processor *sp);
void ibmasm_unregister_uart(struct service_processor *sp);
#else