Browse Source

libertas_tf: move under marvell vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Kalle Valo 9 years ago
parent
commit
dd3f92dea8

+ 0 - 19
drivers/net/wireless/Kconfig

@@ -40,25 +40,6 @@ config PCMCIA_RAYCS
 	  To compile this driver as a module, choose M here: the module will be
 	  To compile this driver as a module, choose M here: the module will be
 	  called ray_cs.  If unsure, say N.
 	  called ray_cs.  If unsure, say N.
 
 
-config LIBERTAS_THINFIRM
-	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
-	depends on MAC80211
-	select FW_LOADER
-	---help---
-	  A library for Marvell Libertas 8xxx devices using thinfirm.
-
-config LIBERTAS_THINFIRM_DEBUG
-	bool "Enable full debugging output in the Libertas thin firmware module."
-	depends on LIBERTAS_THINFIRM
-	---help---
-	  Debugging support.
-
-config LIBERTAS_THINFIRM_USB
-	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
-	depends on LIBERTAS_THINFIRM && USB
-	---help---
-	  A driver for Marvell Libertas 8388 USB devices using thinfirm.
-
 config PCMCIA_WL3501
 config PCMCIA_WL3501
 	tristate "Planet WL3501 PCMCIA cards"
 	tristate "Planet WL3501 PCMCIA cards"
 	depends on CFG80211 && PCMCIA
 	depends on CFG80211 && PCMCIA

+ 0 - 2
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_USB_ZD1201)	+= zd1201.o
 
 
-obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
-
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
 
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 obj-$(CONFIG_RT2X00)	+= rt2x00/

+ 1 - 0
drivers/net/wireless/marvell/Kconfig

@@ -12,5 +12,6 @@ config WLAN_VENDOR_MARVELL
 if WLAN_VENDOR_MARVELL
 if WLAN_VENDOR_MARVELL
 
 
 source "drivers/net/wireless/marvell/libertas/Kconfig"
 source "drivers/net/wireless/marvell/libertas/Kconfig"
+source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
 
 
 endif # WLAN_VENDOR_MARVELL
 endif # WLAN_VENDOR_MARVELL

+ 2 - 0
drivers/net/wireless/marvell/Makefile

@@ -1 +1,3 @@
 obj-$(CONFIG_LIBERTAS)		+= libertas/
 obj-$(CONFIG_LIBERTAS)		+= libertas/
+
+obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/

+ 18 - 0
drivers/net/wireless/marvell/libertas_tf/Kconfig

@@ -0,0 +1,18 @@
+config LIBERTAS_THINFIRM
+	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
+	depends on MAC80211
+	select FW_LOADER
+	---help---
+	  A library for Marvell Libertas 8xxx devices using thinfirm.
+
+config LIBERTAS_THINFIRM_DEBUG
+	bool "Enable full debugging output in the Libertas thin firmware module."
+	depends on LIBERTAS_THINFIRM
+	---help---
+	  Debugging support.
+
+config LIBERTAS_THINFIRM_USB
+	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
+	depends on LIBERTAS_THINFIRM && USB
+	---help---
+	  A driver for Marvell Libertas 8388 USB devices using thinfirm.

+ 0 - 0
drivers/net/wireless/libertas_tf/Makefile → drivers/net/wireless/marvell/libertas_tf/Makefile


+ 0 - 0
drivers/net/wireless/libertas_tf/cmd.c → drivers/net/wireless/marvell/libertas_tf/cmd.c


+ 0 - 0
drivers/net/wireless/libertas_tf/deb_defs.h → drivers/net/wireless/marvell/libertas_tf/deb_defs.h


+ 0 - 0
drivers/net/wireless/libertas_tf/if_usb.c → drivers/net/wireless/marvell/libertas_tf/if_usb.c


+ 0 - 0
drivers/net/wireless/libertas_tf/if_usb.h → drivers/net/wireless/marvell/libertas_tf/if_usb.h


+ 0 - 0
drivers/net/wireless/libertas_tf/libertas_tf.h → drivers/net/wireless/marvell/libertas_tf/libertas_tf.h


+ 0 - 0
drivers/net/wireless/libertas_tf/main.c → drivers/net/wireless/marvell/libertas_tf/main.c