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

libertas: move under marvell vendor directory 



Part of reorganising wireless drivers directory and Kconfig.

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6708,7 +6708,7 @@ F: drivers/net/ethernet/marvell/sk* 
MARVELL LIBERTAS WIRELESS DRIVER

L:	libertas-dev@lists.infradead.org

S:	Orphan

F:	drivers/net/wireless/libertas/

F:	drivers/net/wireless/marvell/libertas/



MARVELL MV643XX ETHERNET DRIVER

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

drivers/net/wireless/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ source "drivers/net/wireless/atmel/Kconfig" 
source "drivers/net/wireless/broadcom/Kconfig"

source "drivers/net/wireless/cisco/Kconfig"

source "drivers/net/wireless/intel/Kconfig"

source "drivers/net/wireless/marvell/Kconfig"

source "drivers/net/wireless/st/Kconfig"



config PCMCIA_RAYCS
@@ -162,7 +163,6 @@ config MWL8K 


source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/libertas/Kconfig"

source "drivers/net/wireless/orinoco/Kconfig"

source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

drivers/net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/ 
obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/

obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/

obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/

obj-$(CONFIG_WLAN_VENDOR_ST) += st/



obj-$(CONFIG_HERMES)		+= orinoco/
@@ -24,7 +25,6 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o 
obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o



obj-$(CONFIG_USB_ZD1201)	+= zd1201.o

obj-$(CONFIG_LIBERTAS)		+= libertas/



obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/

drivers/net/wireless/marvell/Kconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
config WLAN_VENDOR_MARVELL

	bool "Marvell devices"

	default y

	---help---

	  If you have a wireless card belonging to this class, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about  cards. If you say Y, you will be asked for

	  your specific card in the following questions.



if WLAN_VENDOR_MARVELL



source "drivers/net/wireless/marvell/libertas/Kconfig"



endif # WLAN_VENDOR_MARVELL

drivers/net/wireless/marvell/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_LIBERTAS)		+= libertas/