summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2016-03-28 17:06:19 +0200
committerBjørn Mork <bjorn@mork.no>2016-03-28 17:06:19 +0200
commit0c293dc4665fe8fdbb37157a1607e5f8cc1478cd (patch)
tree1fbed66b2ec5029593be4dcc37192794f52b5cd3
parent6988b67d9af987a7ba47f82cdaa6c9107e55ec3f (diff)
mwlwifi: build thermal support both mwlwifi and thermal are modules20160328-1
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--Kconfig2
-rw-r--r--Makefile4
-rw-r--r--thermal.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/Kconfig b/Kconfig
index a9bcb9c..cbd770e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -21,3 +21,5 @@ config MWLWIFI
supporting more comprehensive client functions for laptops/embedded
devices. MWLWIFI is mac80211-based for full AP/Wireless Bridge.
+config MWLWIFI_THERMAL
+ depends on MWLWIFI && THERMAL && (!MWLWIFI=y && THERMAL=m)
diff --git a/Makefile b/Makefile
index 11cbf8e..f908278 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ mwlwifi-objs += fwcmd.o
mwlwifi-objs += tx.o
mwlwifi-objs += rx.o
mwlwifi-objs += isr.o
-mwlwifi-$(CONFIG_THERMAL) += thermal.o
-mwlwifi-$(CONFIG_DEBUG_FS) += debugfs.o
+mwlwifi-$(CONFIG_MWLWIFI_THERMAL) += thermal.o
+mwlwifi-$(CONFIG_DEBUG_FS) += debugfs.o
ifeq (1, $(BUILD_MFG))
mwlwifi-objs += mfg.o
endif
diff --git a/thermal.h b/thermal.h
index fcdcb47..bb47dc7 100644
--- a/thermal.h
+++ b/thermal.h
@@ -18,7 +18,7 @@
#ifndef _THERMAL_H_
#define _THERMAL_H_
-#ifdef CONFIG_THERMAL
+#ifdef CONFIG_MWLWIFI_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);