summaryrefslogtreecommitdiffstats
path: root/drivers/usb
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/usb
parent0046a46a8f93f5b99b499118779521ba3b017d69 (diff)
downloadblackbird-op-linux-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.tar.gz
blackbird-op-linux-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/usb')
-rw-r--r--drivers/usb/chipidea/otg_fsm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
index 2689375ae5da..262d6ef8df7c 100644
--- a/drivers/usb/chipidea/otg_fsm.h
+++ b/drivers/usb/chipidea/otg_fsm.h
@@ -62,7 +62,7 @@
/* SSEND time before SRP */
#define TB_SSEND_SRP (1500) /* minimum 1.5 sec, section:5.1.2 */
-#ifdef CONFIG_USB_OTG_FSM
+#if IS_ENABLED(CONFIG_USB_OTG_FSM)
int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci);
int ci_otg_fsm_work(struct ci_hdrc *ci);
OpenPOWER on IntegriCloud