mwl8k: move under marvell vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b889f6972c0994eff4e2df50c627b3398cb207a..e622877aaab4a99ec9b34ad6a4017f666dab3ea4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6734,7 +6734,7 @@ MARVELL MWL8K WIRELESS DRIVER
 M:     Lennert Buytenhek <buytenh@wantstofly.org>
 L:     linux-wireless@vger.kernel.org
 S:     Odd Fixes
-F:     drivers/net/wireless/mwl8k.c
+F:     drivers/net/wireless/marvell/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 465665237308a948a286e71ad93e15f6aa734f9d..315982a5ee73a8a2f5e58a0b005e629ab0adf127 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -133,15 +133,6 @@ config MAC80211_HWSIM
          To compile this driver as a module, choose M here: the module will be
          called mac80211_hwsim.  If unsure, say N.
 
-config MWL8K
-       tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
-       depends on MAC80211 && PCI
-       ---help---
-         This driver supports Marvell TOPDOG 802.11 wireless cards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called mwl8k.  If unsure, say N.
-
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 7a95b58a5c76484861f5fcf6e831f94b94776647..9498753f596b9c10c0f2c4af55933a399538454c 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -26,8 +26,6 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN)      += rndis_wlan.o
 
 obj-$(CONFIG_USB_ZD1201)       += zd1201.o
 
-obj-$(CONFIG_MWL8K)    += mwl8k.o
-
 obj-$(CONFIG_RT2X00)   += rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)      += mediatek/

diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig
index bbdbac9a2a45ca525e24026c6ec30514c27afa19..4938c7ec0009c37413cf457f8336f9a1d5eb7406 100644 (file)
--- a/drivers/net/wireless/marvell/Kconfig
+++ b/drivers/net/wireless/marvell/Kconfig
@@ -15,4 +15,13 @@ source "drivers/net/wireless/marvell/libertas/Kconfig"
 source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
 source "drivers/net/wireless/marvell/mwifiex/Kconfig"
 
+config MWL8K
+       tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
+       depends on MAC80211 && PCI
+       ---help---
+         This driver supports Marvell TOPDOG 802.11 wireless cards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called mwl8k.  If unsure, say N.
+
 endif # WLAN_VENDOR_MARVELL

diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile
index f4ab48aaff3c60609cce6a0518aa142b18c1f896..1b0a7d2bc8e688eb6307b6056a325ec9f3fda826 100644 (file)
--- a/drivers/net/wireless/marvell/Makefile
+++ b/drivers/net/wireless/marvell/Makefile
@@ -2,3 +2,5 @@ obj-$(CONFIG_LIBERTAS)          += libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)        += libertas_tf/
 obj-$(CONFIG_MWIFIEX)  += mwifiex/
+
+obj-$(CONFIG_MWL8K)    += mwl8k.o

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
similarity index 100%
rename from drivers/net/wireless/mwl8k.c
rename to drivers/net/wireless/marvell/mwl8k.c