From: Kalle Valo <kvalo@codeaurora.org>
To: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 12/27] libertas_tf: move under marvell vendor directory
Date: Wed, 18 Nov 2015 16:45:51 +0200 [thread overview]
Message-ID: <1447857966-19560-13-git-send-email-kvalo@codeaurora.org> (raw)
In-Reply-To: <1447857966-19560-1-git-send-email-kvalo@codeaurora.org>
Part of reorganising wireless drivers directory and Kconfig.
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/Kconfig | 19 -------------------
drivers/net/wireless/Makefile | 2 --
drivers/net/wireless/marvell/Kconfig | 1 +
drivers/net/wireless/marvell/Makefile | 2 ++
drivers/net/wireless/marvell/libertas_tf/Kconfig | 18 ++++++++++++++++++
.../wireless/{ => marvell}/libertas_tf/Makefile | 0
.../net/wireless/{ => marvell}/libertas_tf/cmd.c | 0
.../wireless/{ => marvell}/libertas_tf/deb_defs.h | 0
.../wireless/{ => marvell}/libertas_tf/if_usb.c | 0
.../wireless/{ => marvell}/libertas_tf/if_usb.h | 0
.../{ => marvell}/libertas_tf/libertas_tf.h | 0
.../net/wireless/{ => marvell}/libertas_tf/main.c | 0
12 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig
rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%)
rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index b11a2d364200..25f52b32d725 100644
--- a/drivers/net/wireless/Kconfig
+++ b/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
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
tristate "Planet WL3501 PCMCIA cards"
depends on CFG80211 && PCMCIA
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index a974a6edb4b6..72b167742ac7 100644
--- 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_LIBERTAS_THINFIRM) += libertas_tf/
-
obj-$(CONFIG_MWL8K) += mwl8k.o
obj-$(CONFIG_RT2X00) += rt2x00/
diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig
index 7842096bea53..97ec8f35745e 100644
--- a/drivers/net/wireless/marvell/Kconfig
+++ b/drivers/net/wireless/marvell/Kconfig
@@ -12,5 +12,6 @@ config WLAN_VENDOR_MARVELL
if WLAN_VENDOR_MARVELL
source "drivers/net/wireless/marvell/libertas/Kconfig"
+source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
endif # WLAN_VENDOR_MARVELL
diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile
index 6f7ac46ded33..8f5eb423b71a 100644
--- a/drivers/net/wireless/marvell/Makefile
+++ b/drivers/net/wireless/marvell/Makefile
@@ -1 +1,3 @@
obj-$(CONFIG_LIBERTAS) += libertas/
+
+obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
diff --git a/drivers/net/wireless/marvell/libertas_tf/Kconfig b/drivers/net/wireless/marvell/libertas_tf/Kconfig
new file mode 100644
index 000000000000..b5557af90048
--- /dev/null
+++ b/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.
diff --git a/drivers/net/wireless/libertas_tf/Makefile b/drivers/net/wireless/marvell/libertas_tf/Makefile
similarity index 100%
rename from drivers/net/wireless/libertas_tf/Makefile
rename to drivers/net/wireless/marvell/libertas_tf/Makefile
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/marvell/libertas_tf/cmd.c
similarity index 100%
rename from drivers/net/wireless/libertas_tf/cmd.c
rename to drivers/net/wireless/marvell/libertas_tf/cmd.c
diff --git a/drivers/net/wireless/libertas_tf/deb_defs.h b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h
similarity index 100%
rename from drivers/net/wireless/libertas_tf/deb_defs.h
rename to drivers/net/wireless/marvell/libertas_tf/deb_defs.h
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
similarity index 100%
rename from drivers/net/wireless/libertas_tf/if_usb.c
rename to drivers/net/wireless/marvell/libertas_tf/if_usb.c
diff --git a/drivers/net/wireless/libertas_tf/if_usb.h b/drivers/net/wireless/marvell/libertas_tf/if_usb.h
similarity index 100%
rename from drivers/net/wireless/libertas_tf/if_usb.h
rename to drivers/net/wireless/marvell/libertas_tf/if_usb.h
diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
similarity index 100%
rename from drivers/net/wireless/libertas_tf/libertas_tf.h
rename to drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c
similarity index 100%
rename from drivers/net/wireless/libertas_tf/main.c
rename to drivers/net/wireless/marvell/libertas_tf/main.c
--
1.7.9.5
next prev parent reply other threads:[~2015-11-18 14:45 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-18 14:45 [PATCH v2 00/27] wireless drivers vendor directories Kalle Valo
2015-11-18 14:45 ` [PATCH v2 01/27] adm80211: move under admtek vendor directory Kalle Valo
2015-11-18 14:45 ` [PATCH v2 02/27] airo: move under cisco " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 03/27] atmel: move under atmel " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 04/27] b43: move under broadcom " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 05/27] b43legacy: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 06/27] brcm80211: " Kalle Valo
2015-11-18 19:19 ` Hauke Mehrtens
2015-11-18 19:21 ` Florian Fainelli
[not found] ` <564CCFC3.3030909-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-19 7:54 ` Kalle Valo
2015-11-20 21:51 ` Arend van Spriel
2015-11-19 7:48 ` Kalle Valo
2015-11-20 21:53 ` Arend van Spriel
2015-11-21 13:46 ` Hauke Mehrtens
2015-11-22 17:23 ` Kalle Valo
2015-11-23 10:28 ` Arend van Spriel
2015-11-23 10:36 ` Arend van Spriel
2015-11-25 9:17 ` Kalle Valo
2015-11-18 14:45 ` [PATCH v2 07/27] cw1200: move under st " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 08/27] ipw2x00: move under intel " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 09/27] iwlegacy: move under intel directory Kalle Valo
2015-11-18 14:45 ` [PATCH v2 10/27] iwlwifi: move under intel vendor directory Kalle Valo
2015-11-18 21:21 ` Emmanuel Grumbach
2015-11-18 21:30 ` David Miller
2015-11-18 14:45 ` [PATCH v2 11/27] libertas: move under marvell " Kalle Valo
2015-11-18 14:45 ` Kalle Valo [this message]
2015-11-18 14:45 ` [PATCH v2 13/27] mwifiex: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 14/27] mwl8k: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 15/27] zd1201: move under zydas " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 16/27] zd1211rw: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 17/27] hostap: move under intersil " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 18/27] p54: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 19/27] orinoco: " Kalle Valo
2015-11-18 14:45 ` [PATCH v2 20/27] prism54: " Kalle Valo
2015-11-18 14:46 ` [PATCH v2 21/27] realtek: create separate Kconfig file Kalle Valo
[not found] ` <1447857966-19560-22-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-18 16:30 ` Larry Finger
2015-11-18 14:46 ` [PATCH v2 22/27] rsi: add vendor Kconfig entry Kalle Valo
2015-11-18 14:46 ` [PATCH v2 23/27] rt2x00: move under ralink vendor directory Kalle Valo
[not found] ` <1447857966-19560-24-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-19 22:05 ` Jakub Kicinski
2015-11-20 9:29 ` Kalle Valo
2015-11-18 14:46 ` [PATCH v2 24/27] mediatek: unify Kconfig with other vendors Kalle Valo
2015-11-18 14:46 ` [PATCH v2 25/27] ti: " Kalle Valo
2015-11-18 14:46 ` [PATCH v2 26/27] ath: " Kalle Valo
[not found] ` <1447857966-19560-1-git-send-email-kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-11-18 14:46 ` [PATCH v2 27/27] mac80211_hwsim: move Kconfig entry for sorting alphabetically Kalle Valo
2015-11-22 17:30 ` [PATCH v2 00/27] wireless drivers vendor directories Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447857966-19560-13-git-send-email-kvalo@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).