From f08876b18c1a8df51efc5b0762830e1bfd4ae958 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 17 Dec 2017 00:47:58 +0100
Subject: mwlwifi: enable mwlwifi in kconfig and makefile

This only adds the required lines in Kconfig/Makefile and renames
Makefile.kernel to Makefile.
---
 drivers/net/wireless/marvell/Kconfig                 |  1 +
 drivers/net/wireless/marvell/Makefile                |  1 +
 drivers/net/wireless/marvell/mwlwifi/Makefile        | 13 ++-----------
 drivers/net/wireless/marvell/mwlwifi/Makefile.kernel | 17 -----------------
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 drivers/net/wireless/marvell/mwlwifi/Makefile.kernel

diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig
index 4938c7e..c7c7e0e4 100644
--- a/drivers/net/wireless/marvell/Kconfig
+++ b/drivers/net/wireless/marvell/Kconfig
@@ -14,6 +14,7 @@ if WLAN_VENDOR_MARVELL
 source "drivers/net/wireless/marvell/libertas/Kconfig"
 source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
 source "drivers/net/wireless/marvell/mwifiex/Kconfig"
+source "drivers/net/wireless/marvell/mwlwifi/Kconfig"
 
 config MWL8K
 	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile
index 1b0a7d2..04dff33 100644
--- a/drivers/net/wireless/marvell/Makefile
+++ b/drivers/net/wireless/marvell/Makefile
@@ -2,5 +2,6 @@ obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
+obj-$(CONFIG_MWLWIFI)	+= mwlwifi/
 
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
diff --git a/drivers/net/wireless/marvell/mwlwifi/Makefile b/drivers/net/wireless/marvell/mwlwifi/Makefile
index 038dcdc..2250354 100644
--- a/drivers/net/wireless/marvell/mwlwifi/Makefile
+++ b/drivers/net/wireless/marvell/mwlwifi/Makefile
@@ -1,4 +1,4 @@
-obj-m += mwlwifi.o
+obj-$(CONFIG_MWLWIFI)	+= mwlwifi.o
 
 mwlwifi-objs			+= core.o
 mwlwifi-objs			+= mac80211.o
@@ -14,13 +14,4 @@ mwlwifi-objs			+= hif/pcie/tx_ndp.o
 mwlwifi-objs			+= hif/pcie/rx_ndp.o
 
 ccflags-y += -I$(src)
-ccflags-y += -O2 -funroll-loops -D__CHECK_ENDIAN__
-
-all:
-	$(MAKE) -C $(KDIR) M=$(PWD)
-
-clean:
-	rm -f *.a *.s *.ko *.ko.cmd *.mod.* .mwlwifi.* modules.order Module.symvers
-	rm -rf .tmp_versions
-	find . -name ".*.o.cmd" -exec rm -f {} \;
-	find . -name "*.o" -exec rm -f {} \;
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/marvell/mwlwifi/Makefile.kernel b/drivers/net/wireless/marvell/mwlwifi/Makefile.kernel
deleted file mode 100644
index 2250354..0000000
--- a/drivers/net/wireless/marvell/mwlwifi/Makefile.kernel
+++ /dev/null
@@ -1,17 +0,0 @@
-obj-$(CONFIG_MWLWIFI)	+= mwlwifi.o
-
-mwlwifi-objs			+= core.o
-mwlwifi-objs			+= mac80211.o
-mwlwifi-objs			+= utils.o
-mwlwifi-$(CONFIG_THERMAL)	+= thermal.o
-mwlwifi-$(CONFIG_DEBUG_FS)	+= debugfs.o
-mwlwifi-objs			+= hif/fwcmd.o
-mwlwifi-objs			+= hif/pcie/pcie.o
-mwlwifi-objs			+= hif/pcie/fwdl.o
-mwlwifi-objs			+= hif/pcie/tx.o
-mwlwifi-objs			+= hif/pcie/rx.o
-mwlwifi-objs			+= hif/pcie/tx_ndp.o
-mwlwifi-objs			+= hif/pcie/rx_ndp.o
-
-ccflags-y += -I$(src)
-ccflags-y += -D__CHECK_ENDIAN__
-- 
2.8.0.rc2.1.gbe9624a