summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2016-03-28 17:29:43 +0200
committerBjørn Mork <bjorn@mork.no>2016-03-28 17:29:43 +0200
commit512452f93f997bcab904c0efafd0a48a7d6553dd (patch)
tree6cdc993d3bc312dafb833f42e2b93d6bf8515054
parentbbd0a5f54c6a0902b480a440d33c99fabb2b17a6 (diff)
mwlwifi: squashme20160328-3
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--Kconfig2
-rw-r--r--Makefile.external4
-rw-r--r--Makefile.kernel4
3 files changed, 5 insertions, 5 deletions
diff --git a/Kconfig b/Kconfig
index d3532d1..cbd770e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -22,4 +22,4 @@ config MWLWIFI
devices. MWLWIFI is mac80211-based for full AP/Wireless Bridge.
config MWLWIFI_THERMAL
- def_bool MWLWIFI && THERMAL && (!MWLWIFI=y && THERMAL=m)
+ depends on MWLWIFI && THERMAL && (!MWLWIFI=y && THERMAL=m)
diff --git a/Makefile.external b/Makefile.external
index 11cbf8e..f908278 100644
--- a/Makefile.external
+++ b/Makefile.external
@@ -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/Makefile.kernel b/Makefile.kernel
index 37af74f..e10aa42 100644
--- a/Makefile.kernel
+++ b/Makefile.kernel
@@ -7,7 +7,7 @@ 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
ccflags-y += -D__CHECK_ENDIAN__