Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mwl8k: move under marvell vendor directory

Part of reorganising wireless drivers directory and Kconfig.

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

+12 -12
+1 -1
MAINTAINERS
··· 6734 6734 M: Lennert Buytenhek <buytenh@wantstofly.org> 6735 6735 L: linux-wireless@vger.kernel.org 6736 6736 S: Odd Fixes 6737 - F: drivers/net/wireless/mwl8k.c 6737 + F: drivers/net/wireless/marvell/mwl8k.c 6738 6738 6739 6739 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER 6740 6740 M: Nicolas Pitre <nico@fluxnic.net>
-9
drivers/net/wireless/Kconfig
··· 133 133 To compile this driver as a module, choose M here: the module will be 134 134 called mac80211_hwsim. If unsure, say N. 135 135 136 - config MWL8K 137 - tristate "Marvell 88W8xxx PCI/PCIe Wireless support" 138 - depends on MAC80211 && PCI 139 - ---help--- 140 - This driver supports Marvell TOPDOG 802.11 wireless cards. 141 - 142 - To compile this driver as a module, choose M here: the module 143 - will be called mwl8k. If unsure, say N. 144 - 145 136 source "drivers/net/wireless/ath/Kconfig" 146 137 source "drivers/net/wireless/hostap/Kconfig" 147 138 source "drivers/net/wireless/orinoco/Kconfig"
-2
drivers/net/wireless/Makefile
··· 26 26 27 27 obj-$(CONFIG_USB_ZD1201) += zd1201.o 28 28 29 - obj-$(CONFIG_MWL8K) += mwl8k.o 30 - 31 29 obj-$(CONFIG_RT2X00) += rt2x00/ 32 30 33 31 obj-$(CONFIG_WL_MEDIATEK) += mediatek/
+9
drivers/net/wireless/marvell/Kconfig
··· 15 15 source "drivers/net/wireless/marvell/libertas_tf/Kconfig" 16 16 source "drivers/net/wireless/marvell/mwifiex/Kconfig" 17 17 18 + config MWL8K 19 + tristate "Marvell 88W8xxx PCI/PCIe Wireless support" 20 + depends on MAC80211 && PCI 21 + ---help--- 22 + This driver supports Marvell TOPDOG 802.11 wireless cards. 23 + 24 + To compile this driver as a module, choose M here: the module 25 + will be called mwl8k. If unsure, say N. 26 + 18 27 endif # WLAN_VENDOR_MARVELL
+2
drivers/net/wireless/marvell/Makefile
··· 2 2 3 3 obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ 4 4 obj-$(CONFIG_MWIFIEX) += mwifiex/ 5 + 6 + obj-$(CONFIG_MWL8K) += mwl8k.o
drivers/net/wireless/mwl8k.c drivers/net/wireless/marvell/mwl8k.c