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

Commit 5c601d0c authored by Pavel Machek's avatar Pavel Machek Committed by John W. Linville
Browse files

[PATCH] wireless: move zd1201 where it belongs



zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
noone can find it. This moves Kconfig/Makefile zd1201 to the right
place.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff7562aa
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -531,6 +531,23 @@ config PRISM54
	  say M here and read <file:Documentation/modules.txt>.  The module
	  will be called prism54.ko.

config USB_ZD1201
	tristate "USB ZD1201 based Wireless device support"
	depends on USB && NET_RADIO
	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.

source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/bcm43xx/Kconfig"

+2 −0
Original line number Diff line number Diff line
@@ -40,3 +40,5 @@ obj-$(CONFIG_BCM43XX) += bcm43xx/
# 16-bit wireless PCMCIA client drivers
obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o

obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
+0 −0

File moved.

+0 −0

File moved.

+0 −17
Original line number Diff line number Diff line
@@ -301,21 +301,4 @@ config USB_NET_ZAURUS
	  some cases CDC MDLM) protocol, not "g_ether".


config USB_ZD1201
	tristate "USB ZD1201 based Wireless device support"
	depends on NET_RADIO
	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.

endmenu
Loading