diff options
| author | Michal Marek <mmarek@suse.com> | 2015-10-27 13:02:24 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-11-25 10:23:25 (GMT) |
| commit | cf4f21938e13ea1533ebdcb21c46f1d998a44ee8 (patch) | |
| tree | b26af8415bc9f916124e27b4bbfd3209270e40f6 /drivers | |
| parent | 0046a46a8f93f5b99b499118779521ba3b017d69 (diff) | |
| download | linux-cf4f21938e13ea1533ebdcb21c46f1d998a44ee8.tar.xz | |
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')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasm.h | 2 | ||||
| -rw-r--r-- | drivers/usb/chipidea/otg_fsm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 9b08344..5bd1277 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 diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h index 2689375..262d6ef 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); |