From 081b775d515cc53a95ee3ef777f44719b0d57f04 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Mon, 28 Mar 2016 17:41:19 +0200 Subject: mwlwifi: build thermal support both mwlwifi and thermal are modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork --- Makefile | 3 +++ thermal.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 11cbf8e..4aa2b8d 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ mwlwifi-objs += tx.o mwlwifi-objs += rx.o mwlwifi-objs += isr.o mwlwifi-$(CONFIG_THERMAL) += thermal.o +ifeq (m, $(CONFIG_THERMAL)) +mwlwifi-objs += thermal.o +endif mwlwifi-$(CONFIG_DEBUG_FS) += debugfs.o ifeq (1, $(BUILD_MFG)) mwlwifi-objs += mfg.o diff --git a/thermal.h b/thermal.h index fcdcb47..ec36a0c 100644 --- a/thermal.h +++ b/thermal.h @@ -18,7 +18,7 @@ #ifndef _THERMAL_H_ #define _THERMAL_H_ -#ifdef CONFIG_THERMAL +#if IS_ENABLED(CONFIG_THERMAL) int mwl_thermal_register(struct mwl_priv *priv); void mwl_thermal_unregister(struct mwl_priv *priv); void mwl_thermal_set_throttling(struct mwl_priv *priv); -- cgit v1.2.3