From 6f85c4dcf66a13796c6f92b7ecbbbad582fa3148 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@suse.cz>
Date: Mon, 5 Jun 2006 16:13:30 -0400
Subject: [PATCH] --- yaml --- r: 27407 b: refs/heads/master c:
 5c601d0c942f5aaf7f3cff7e08f61047d70a964e h: refs/heads/master i:   27405:
 d83cba204a9d7313980127f5a8a31f3a2eeba443   27403:
 2ffae6dd6c45bc5fd370b3737aa1c8538ff7a103   27399:
 e43cac235a59dbc19dc4a9df7d8305b8f77f4f75   27391:
 ce7729081e65ac1df3131aaa9d1b16fc148ae2ff v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/wireless/Kconfig              | 17 +++++++++++++++++
 trunk/drivers/net/wireless/Makefile             |  2 ++
 .../drivers/{usb/net => net/wireless}/zd1201.c  |  0
 .../drivers/{usb/net => net/wireless}/zd1201.h  |  0
 trunk/drivers/usb/net/Kconfig                   | 17 -----------------
 trunk/drivers/usb/net/Makefile                  |  1 -
 7 files changed, 20 insertions(+), 19 deletions(-)
 rename trunk/drivers/{usb/net => net/wireless}/zd1201.c (100%)
 rename trunk/drivers/{usb/net => net/wireless}/zd1201.h (100%)

diff --git a/[refs] b/[refs]
index b7be915fc980..6f6d6e56a6e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff7562aaec1e68448888572033f072fc21ef2ac8
+refs/heads/master: 5c601d0c942f5aaf7f3cff7e08f61047d70a964e
diff --git a/trunk/drivers/net/wireless/Kconfig b/trunk/drivers/net/wireless/Kconfig
index d7691c482835..30ec235e6935 100644
--- a/trunk/drivers/net/wireless/Kconfig
+++ b/trunk/drivers/net/wireless/Kconfig
@@ -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"
 
diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/drivers/net/wireless/Makefile
index c86779879361..512603de309a 100644
--- a/trunk/drivers/net/wireless/Makefile
+++ b/trunk/drivers/net/wireless/Makefile
@@ -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
diff --git a/trunk/drivers/usb/net/zd1201.c b/trunk/drivers/net/wireless/zd1201.c
similarity index 100%
rename from trunk/drivers/usb/net/zd1201.c
rename to trunk/drivers/net/wireless/zd1201.c
diff --git a/trunk/drivers/usb/net/zd1201.h b/trunk/drivers/net/wireless/zd1201.h
similarity index 100%
rename from trunk/drivers/usb/net/zd1201.h
rename to trunk/drivers/net/wireless/zd1201.h
diff --git a/trunk/drivers/usb/net/Kconfig b/trunk/drivers/usb/net/Kconfig
index efd6ca7e4ac5..054059632a21 100644
--- a/trunk/drivers/usb/net/Kconfig
+++ b/trunk/drivers/usb/net/Kconfig
@@ -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
diff --git a/trunk/drivers/usb/net/Makefile b/trunk/drivers/usb/net/Makefile
index a21e6eaabaf6..160f19dbdf12 100644
--- a/trunk/drivers/usb/net/Makefile
+++ b/trunk/drivers/usb/net/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o
 obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
 obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
 obj-$(CONFIG_USB_USBNET)	+= usbnet.o
-obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG