netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 16/27] zd1211rw: move under zydas vendor directory
Date: Wed, 18 Nov 2015 16:45:55 +0200	[thread overview]
Message-ID: <1447857966-19560-17-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                       |    1 -
 drivers/net/wireless/Makefile                      |    1 -
 drivers/net/wireless/zydas/Kconfig                 |    2 ++
 drivers/net/wireless/zydas/Makefile                |    2 ++
 drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/Makefile |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.c    |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.h    |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c   |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h |    0
 20 files changed, 5 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Makefile (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index ec098370ef3d..f2e78420488c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11883,7 +11883,7 @@ W:	http://zd1211.ath.cx/wiki/DriverRewrite
 L:	linux-wireless@vger.kernel.org
 L:	zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:	Maintained
-F:	drivers/net/wireless/zd1211rw/
+F:	drivers/net/wireless/zydas/zd1211rw/
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:	Dan Streetman <ddstreet@ieee.org>
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 35155e2dc8bf..e86dcdd5cfcb 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -124,7 +124,6 @@ source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 4ee6d6d08743..8f54adde831e 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
-obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
 obj-$(CONFIG_WLAN)		+= realtek/
 
 # 16-bit wireless PCMCIA client drivers
diff --git a/drivers/net/wireless/zydas/Kconfig b/drivers/net/wireless/zydas/Kconfig
index 6140dfa04fed..a58c0f65e376 100644
--- a/drivers/net/wireless/zydas/Kconfig
+++ b/drivers/net/wireless/zydas/Kconfig
@@ -30,4 +30,6 @@ config USB_ZD1201
 	  To compile this driver as a module, choose M here: the
 	  module will be called zd1201.
 
+source "drivers/net/wireless/zydas/zd1211rw/Kconfig"
+
 endif # WLAN_VENDOR_ZYDAS
diff --git a/drivers/net/wireless/zydas/Makefile b/drivers/net/wireless/zydas/Makefile
index 37179ef890ea..679fbbf3a6cd 100644
--- a/drivers/net/wireless/zydas/Makefile
+++ b/drivers/net/wireless/zydas/Makefile
@@ -1 +1,3 @@
+obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
diff --git a/drivers/net/wireless/zd1211rw/Kconfig b/drivers/net/wireless/zydas/zd1211rw/Kconfig
similarity index 100%
rename from drivers/net/wireless/zd1211rw/Kconfig
rename to drivers/net/wireless/zydas/zd1211rw/Kconfig
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zydas/zd1211rw/Makefile
similarity index 100%
rename from drivers/net/wireless/zd1211rw/Makefile
rename to drivers/net/wireless/zydas/zd1211rw/Makefile
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zydas/zd1211rw/zd_chip.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_chip.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.c
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zydas/zd1211rw/zd_chip.h
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_chip.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.h
diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zydas/zd1211rw/zd_def.h
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_def.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_def.h
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_mac.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.c
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zydas/zd1211rw/zd_mac.h
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_mac.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.h
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.c
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zydas/zd1211rw/zd_rf.h
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.h
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_al2230.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_usb.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.c
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zydas/zd1211rw/zd_usb.h
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_usb.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.h
-- 
1.7.9.5

  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 ` [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 ` Kalle Valo [this message]
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-17-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).