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 07/27] cw1200: move under st vendor directory
Date: Wed, 18 Nov 2015 16:45:46 +0200 [thread overview]
Message-ID: <1447857966-19560-8-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>
---
MAINTAINERS | 2 +-
drivers/net/wireless/Kconfig | 2 +-
drivers/net/wireless/Makefile | 2 +-
drivers/net/wireless/st/Kconfig | 16 ++++++++++++++++
drivers/net/wireless/st/Makefile | 1 +
drivers/net/wireless/{ => st}/cw1200/Kconfig | 0
drivers/net/wireless/{ => st}/cw1200/Makefile | 0
drivers/net/wireless/{ => st}/cw1200/bh.c | 0
drivers/net/wireless/{ => st}/cw1200/bh.h | 0
drivers/net/wireless/{ => st}/cw1200/cw1200.h | 0
drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c | 0
drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c | 0
drivers/net/wireless/{ => st}/cw1200/debug.c | 0
drivers/net/wireless/{ => st}/cw1200/debug.h | 0
drivers/net/wireless/{ => st}/cw1200/fwio.c | 0
drivers/net/wireless/{ => st}/cw1200/fwio.h | 0
drivers/net/wireless/{ => st}/cw1200/hwbus.h | 0
drivers/net/wireless/{ => st}/cw1200/hwio.c | 0
drivers/net/wireless/{ => st}/cw1200/hwio.h | 0
drivers/net/wireless/{ => st}/cw1200/main.c | 0
drivers/net/wireless/{ => st}/cw1200/pm.c | 0
drivers/net/wireless/{ => st}/cw1200/pm.h | 0
drivers/net/wireless/{ => st}/cw1200/queue.c | 0
drivers/net/wireless/{ => st}/cw1200/queue.h | 0
drivers/net/wireless/{ => st}/cw1200/scan.c | 0
drivers/net/wireless/{ => st}/cw1200/scan.h | 0
drivers/net/wireless/{ => st}/cw1200/sta.c | 0
drivers/net/wireless/{ => st}/cw1200/sta.h | 0
drivers/net/wireless/{ => st}/cw1200/txrx.c | 0
drivers/net/wireless/{ => st}/cw1200/txrx.h | 0
drivers/net/wireless/{ => st}/cw1200/wsm.c | 0
drivers/net/wireless/{ => st}/cw1200/wsm.h | 0
32 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 drivers/net/wireless/st/Kconfig
create mode 100644 drivers/net/wireless/st/Makefile
rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%)
rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%)
rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/main.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/sta.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%)
rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%)
rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 748ee82f2ebe..4cbd4641e6fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3100,7 +3100,7 @@ F: sound/pci/cs5535audio/
CW1200 WLAN driver
M: Solomon Peachy <pizza@shaftnet.org>
S: Maintained
-F: drivers/net/wireless/cw1200/
+F: drivers/net/wireless/st/cw1200/
CX18 VIDEO4LINUX DRIVER
M: Andy Walls <awalls@md.metrocast.net>
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c627d9e41ede..c1742f228fec 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -21,6 +21,7 @@ source "drivers/net/wireless/admtek/Kconfig"
source "drivers/net/wireless/atmel/Kconfig"
source "drivers/net/wireless/broadcom/Kconfig"
source "drivers/net/wireless/cisco/Kconfig"
+source "drivers/net/wireless/st/Kconfig"
config PCMCIA_RAYCS
tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -173,7 +174,6 @@ source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
source "drivers/net/wireless/ti/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
source "drivers/net/wireless/mwifiex/Kconfig"
-source "drivers/net/wireless/cw1200/Kconfig"
source "drivers/net/wireless/rsi/Kconfig"
endif # WLAN
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 41ebe5641c01..d7211a7949e6 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_WLAN_VENDOR_ST) += st/
obj-$(CONFIG_IPW2100) += ipw2x00/
obj-$(CONFIG_IPW2200) += ipw2x00/
@@ -47,5 +48,4 @@ obj-$(CONFIG_WL_TI) += ti/
obj-$(CONFIG_MWIFIEX) += mwifiex/
-obj-$(CONFIG_CW1200) += cw1200/
obj-$(CONFIG_RSI_91X) += rsi/
diff --git a/drivers/net/wireless/st/Kconfig b/drivers/net/wireless/st/Kconfig
new file mode 100644
index 000000000000..969b4f6e53b5
--- /dev/null
+++ b/drivers/net/wireless/st/Kconfig
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_ST
+ bool "STMicroelectronics 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_ST
+
+source "drivers/net/wireless/st/cw1200/Kconfig"
+
+endif # WLAN_VENDOR_ST
diff --git a/drivers/net/wireless/st/Makefile b/drivers/net/wireless/st/Makefile
new file mode 100644
index 000000000000..a60d6350ba46
--- /dev/null
+++ b/drivers/net/wireless/st/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_CW1200) += cw1200/
diff --git a/drivers/net/wireless/cw1200/Kconfig b/drivers/net/wireless/st/cw1200/Kconfig
similarity index 100%
rename from drivers/net/wireless/cw1200/Kconfig
rename to drivers/net/wireless/st/cw1200/Kconfig
diff --git a/drivers/net/wireless/cw1200/Makefile b/drivers/net/wireless/st/cw1200/Makefile
similarity index 100%
rename from drivers/net/wireless/cw1200/Makefile
rename to drivers/net/wireless/st/cw1200/Makefile
diff --git a/drivers/net/wireless/cw1200/bh.c b/drivers/net/wireless/st/cw1200/bh.c
similarity index 100%
rename from drivers/net/wireless/cw1200/bh.c
rename to drivers/net/wireless/st/cw1200/bh.c
diff --git a/drivers/net/wireless/cw1200/bh.h b/drivers/net/wireless/st/cw1200/bh.h
similarity index 100%
rename from drivers/net/wireless/cw1200/bh.h
rename to drivers/net/wireless/st/cw1200/bh.h
diff --git a/drivers/net/wireless/cw1200/cw1200.h b/drivers/net/wireless/st/cw1200/cw1200.h
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200.h
rename to drivers/net/wireless/st/cw1200/cw1200.h
diff --git a/drivers/net/wireless/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200_sdio.c
rename to drivers/net/wireless/st/cw1200/cw1200_sdio.c
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200_spi.c
rename to drivers/net/wireless/st/cw1200/cw1200_spi.c
diff --git a/drivers/net/wireless/cw1200/debug.c b/drivers/net/wireless/st/cw1200/debug.c
similarity index 100%
rename from drivers/net/wireless/cw1200/debug.c
rename to drivers/net/wireless/st/cw1200/debug.c
diff --git a/drivers/net/wireless/cw1200/debug.h b/drivers/net/wireless/st/cw1200/debug.h
similarity index 100%
rename from drivers/net/wireless/cw1200/debug.h
rename to drivers/net/wireless/st/cw1200/debug.h
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/st/cw1200/fwio.c
similarity index 100%
rename from drivers/net/wireless/cw1200/fwio.c
rename to drivers/net/wireless/st/cw1200/fwio.c
diff --git a/drivers/net/wireless/cw1200/fwio.h b/drivers/net/wireless/st/cw1200/fwio.h
similarity index 100%
rename from drivers/net/wireless/cw1200/fwio.h
rename to drivers/net/wireless/st/cw1200/fwio.h
diff --git a/drivers/net/wireless/cw1200/hwbus.h b/drivers/net/wireless/st/cw1200/hwbus.h
similarity index 100%
rename from drivers/net/wireless/cw1200/hwbus.h
rename to drivers/net/wireless/st/cw1200/hwbus.h
diff --git a/drivers/net/wireless/cw1200/hwio.c b/drivers/net/wireless/st/cw1200/hwio.c
similarity index 100%
rename from drivers/net/wireless/cw1200/hwio.c
rename to drivers/net/wireless/st/cw1200/hwio.c
diff --git a/drivers/net/wireless/cw1200/hwio.h b/drivers/net/wireless/st/cw1200/hwio.h
similarity index 100%
rename from drivers/net/wireless/cw1200/hwio.h
rename to drivers/net/wireless/st/cw1200/hwio.h
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/st/cw1200/main.c
similarity index 100%
rename from drivers/net/wireless/cw1200/main.c
rename to drivers/net/wireless/st/cw1200/main.c
diff --git a/drivers/net/wireless/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
similarity index 100%
rename from drivers/net/wireless/cw1200/pm.c
rename to drivers/net/wireless/st/cw1200/pm.c
diff --git a/drivers/net/wireless/cw1200/pm.h b/drivers/net/wireless/st/cw1200/pm.h
similarity index 100%
rename from drivers/net/wireless/cw1200/pm.h
rename to drivers/net/wireless/st/cw1200/pm.h
diff --git a/drivers/net/wireless/cw1200/queue.c b/drivers/net/wireless/st/cw1200/queue.c
similarity index 100%
rename from drivers/net/wireless/cw1200/queue.c
rename to drivers/net/wireless/st/cw1200/queue.c
diff --git a/drivers/net/wireless/cw1200/queue.h b/drivers/net/wireless/st/cw1200/queue.h
similarity index 100%
rename from drivers/net/wireless/cw1200/queue.h
rename to drivers/net/wireless/st/cw1200/queue.h
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/st/cw1200/scan.c
similarity index 100%
rename from drivers/net/wireless/cw1200/scan.c
rename to drivers/net/wireless/st/cw1200/scan.c
diff --git a/drivers/net/wireless/cw1200/scan.h b/drivers/net/wireless/st/cw1200/scan.h
similarity index 100%
rename from drivers/net/wireless/cw1200/scan.h
rename to drivers/net/wireless/st/cw1200/scan.h
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c
similarity index 100%
rename from drivers/net/wireless/cw1200/sta.c
rename to drivers/net/wireless/st/cw1200/sta.c
diff --git a/drivers/net/wireless/cw1200/sta.h b/drivers/net/wireless/st/cw1200/sta.h
similarity index 100%
rename from drivers/net/wireless/cw1200/sta.h
rename to drivers/net/wireless/st/cw1200/sta.h
diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/st/cw1200/txrx.c
similarity index 100%
rename from drivers/net/wireless/cw1200/txrx.c
rename to drivers/net/wireless/st/cw1200/txrx.c
diff --git a/drivers/net/wireless/cw1200/txrx.h b/drivers/net/wireless/st/cw1200/txrx.h
similarity index 100%
rename from drivers/net/wireless/cw1200/txrx.h
rename to drivers/net/wireless/st/cw1200/txrx.h
diff --git a/drivers/net/wireless/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c
similarity index 100%
rename from drivers/net/wireless/cw1200/wsm.c
rename to drivers/net/wireless/st/cw1200/wsm.c
diff --git a/drivers/net/wireless/cw1200/wsm.h b/drivers/net/wireless/st/cw1200/wsm.h
similarity index 100%
rename from drivers/net/wireless/cw1200/wsm.h
rename to drivers/net/wireless/st/cw1200/wsm.h
--
1.7.9.5
next prev parent reply other threads:[~2015-11-18 14:46 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
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 ` Kalle Valo [this message]
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 ` [PATCH v2 12/27] libertas_tf: " Kalle Valo
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
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
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
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-8-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).