Commit de60f1dc authored by Kalle Valo's avatar Kalle Valo
Browse files

mwl8k: move under marvell vendor directory 



Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 277b024e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/wireless/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -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"

drivers/net/wireless/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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/

drivers/net/wireless/marvell/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/marvell/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ obj-$(CONFIG_LIBERTAS) += libertas/ 


obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/

obj-$(CONFIG_MWIFIEX)	+= mwifiex/



obj-$(CONFIG_MWL8K)	+= mwl8k.o