Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

zd1201: move under zydas vendor directory 



Part of reorganising wireless drivers directory and Kconfig.

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11252,7 +11252,7 @@ USB ZD1201 DRIVER 
L:	linux-wireless@vger.kernel.org

W:	http://linux-lc100020.sourceforge.net

S:	Orphan

F:	drivers/net/wireless/zd1201.*

F:	drivers/net/wireless/zydas/zd1201.*



USB ZR364XX DRIVER

M:	Antoine Jacquet <royale@zerezo.com>

drivers/net/wireless/Kconfig

+1 −19
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig" 
source "drivers/net/wireless/intel/Kconfig"

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

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

source "drivers/net/wireless/zydas/Kconfig"



config PCMCIA_RAYCS

	tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -70,25 +71,6 @@ config PRISM54 


	  When built as module you get the module prism54



config USB_ZD1201

	tristate "USB ZD1201 based Wireless device support"

	depends on CFG80211 && USB

	select WIRELESS_EXT

	select WEXT_PRIV

	select FW_LOADER

	---help---

	  Say Y if you want to use wireless LAN adapters based on the ZyDAS

	  ZD1201 chip.



	  This driver makes the adapter appear as a normal Ethernet interface,

	  typically on wlan0.



	  The zd1201 device requires external firmware to be loaded.

	  This can be found at http://linux-lc100020.sourceforge.net/



	  To compile this driver as a module, choose M here: the

	  module will be called zd1201.



config USB_NET_RNDIS_WLAN

	tristate "Wireless RNDIS USB support"

	depends on USB

drivers/net/wireless/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 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_WLAN_VENDOR_ZYDAS) += zydas/



obj-$(CONFIG_HERMES)		+= orinoco/
@@ -24,8 +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_RT2X00)	+= rt2x00/



obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/

drivers/net/wireless/zydas/Kconfig

0 → 100644
+33 −0
Original line number Diff line number Diff line 
config WLAN_VENDOR_ZYDAS

	bool "ZyDAS 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_ZYDAS



config USB_ZD1201

	tristate "USB ZD1201 based Wireless device support"

	depends on CFG80211 && USB

	select WIRELESS_EXT

	select WEXT_PRIV

	select FW_LOADER

	---help---

	  Say Y if you want to use wireless LAN adapters based on the ZyDAS

	  ZD1201 chip.



	  This driver makes the adapter appear as a normal Ethernet interface,

	  typically on wlan0.



	  The zd1201 device requires external firmware to be loaded.

	  This can be found at http://linux-lc100020.sourceforge.net/



	  To compile this driver as a module, choose M here: the

	  module will be called zd1201.



endif # WLAN_VENDOR_ZYDAS

drivers/net/wireless/zydas/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_USB_ZD1201)	+= zd1201.o