move zd1201 where it belongs

move zd1201 where it belongs

[Pavel Machek]

zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
noone can find it. This moves Kconfig/Makefile to right place; you
still need to manually move .c and .h files.

Signed-off-by: Pavel Machek <pavel@suse.cz>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index e0874cb..313cfad 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -503,6 +503,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 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/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c867798..512603d 100644
--- a/drivers/net/wireless/Makefile
+++ b/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/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index efd6ca7..0540596 100644
--- a/drivers/usb/net/Kconfig
+++ b/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/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index a21e6ea..160f19d 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndi
 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


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: move zd1201 where it belongs

[Arjan van de Ven]

On Mon, 2006-06-05 at 12:39 +0200, Pavel Machek wrote:
> zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
> noone can find it. This moves Kconfig/Makefile to right place; you
> still need to manually move .c and .h files.
> 
> Signed-off-by: Pavel Machek <pavel@suse.cz>
> 
> diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
> index e0874cb..313cfad 100644
> --- a/drivers/net/wireless/Kconfig
> +++ b/drivers/net/wireless/Kconfig
> @@ -503,6 +503,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 NET_RADIO
> +	select FW_LOADER

do you think it should at least depend in some form or another on
CONFIG_USB ?

Re: move zd1201 where it belongs

[Pavel Machek]

On Po 05-06-06 13:15:20, Arjan van de Ven wrote:
> On Mon, 2006-06-05 at 12:39 +0200, Pavel Machek wrote:
> > zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
> > noone can find it. This moves Kconfig/Makefile to right place; you
> > still need to manually move .c and .h files.
> > 
> > Signed-off-by: Pavel Machek <pavel@suse.cz>
> > 
> > diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
> > index e0874cb..313cfad 100644
> > --- a/drivers/net/wireless/Kconfig
> > +++ b/drivers/net/wireless/Kconfig
> > @@ -503,6 +503,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 NET_RADIO
> > +	select FW_LOADER
> 
> do you think it should at least depend in some form or another on
> CONFIG_USB ?

Right, added USB && to depends directive.
								Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: move zd1201 where it belongs

[John W. Linville]

On Mon, Jun 05, 2006 at 01:33:33PM +0200, Pavel Machek wrote:
> On Po 05-06-06 13:15:20, Arjan van de Ven wrote:
> > On Mon, 2006-06-05 at 12:39 +0200, Pavel Machek wrote:
> > > zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
> > > noone can find it. This moves Kconfig/Makefile to right place; you
> > > still need to manually move .c and .h files.

> > do you think it should at least depend in some form or another on
> > CONFIG_USB ?
> 
> Right, added USB && to depends directive.

Did you mean to only copy Jiri and LKML?

It seems like you should have sent at least sent this to
netdev@vger.kernel.org, if not also to me, Jeroen Vreeken and/or
possibly Greg K-H (USB subsystem).

Will you be posting a new version, with the CONFIG_USB change?

Thanks,

John
-- 
John W. Linville
linville@tuxdriver.com

Re: move zd1201 where it belongs

[Pavel Machek]

Hi!

> > > > zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where
> > > > noone can find it. This moves Kconfig/Makefile to right place; you
> > > > still need to manually move .c and .h files.
> 
> > > do you think it should at least depend in some form or another on
> > > CONFIG_USB ?
> > 
> > Right, added USB && to depends directive.
> 
> Did you mean to only copy Jiri and LKML?

Yes, because this should go in as a git patch (so it is move, not
create new file), and I was hoping for Jiri to generate proper
git-patch :-).

> It seems like you should have sent at least sent this to
> netdev@vger.kernel.org, if not also to me, Jeroen Vreeken and/or
> possibly Greg K-H (USB subsystem).
> 
> Will you be posting a new version, with the CONFIG_USB change?

Here it is, still

Signed-off-by: Pavel Machek <pavel@suse.cz>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index e0874cb..1eccdb3 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -503,6 +503,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/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c867798..512603d 100644
--- a/drivers/net/wireless/Makefile
+++ b/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/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index efd6ca7..0540596 100644
--- a/drivers/usb/net/Kconfig
+++ b/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/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index a21e6ea..160f19d 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndi
 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


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: move zd1201 where it belongs

[Jiri Benc]

On Mon, 5 Jun 2006 16:29:12 +0200, Pavel Machek wrote:
> Yes, because this should go in as a git patch (so it is move, not
> create new file), and I was hoping for Jiri to generate proper
> git-patch :-).

The proper person for this is maintainer of wireless or USB.

> Here it is, still
> 
> Signed-off-by: Pavel Machek <pavel@suse.cz>

In addition to this,
mv drivers/usb/net/zd1201.[ch] drivers/net/wireless/
needs to be invoked.

I agree that the patch should be applied to remove confusion (not many
people know about this driver, even among wireless developers).

 Jiri

-- 
Jiri Benc
SUSE Labs

Re: move zd1201 where it belongs

[John W. Linville]

On Mon, Jun 05, 2006 at 04:29:12PM +0200, Pavel Machek wrote:

> > Did you mean to only copy Jiri and LKML?
> 
> Yes, because this should go in as a git patch (so it is move, not
> create new file), and I was hoping for Jiri to generate proper
> git-patch :-).

Ah, I see.  Well, I can handle this just fine.

Thanks,

John
-- 
John W. Linville
linville@tuxdriver.com

Re: move zd1201 where it belongs

[Greg KH]

On Mon, Jun 05, 2006 at 10:47:26AM -0400, John W. Linville wrote:
> On Mon, Jun 05, 2006 at 04:29:12PM +0200, Pavel Machek wrote:
> 
> > > Did you mean to only copy Jiri and LKML?
> > 
> > Yes, because this should go in as a git patch (so it is move, not
> > create new file), and I was hoping for Jiri to generate proper
> > git-patch :-).
> 
> Ah, I see.  Well, I can handle this just fine.

Ack from my side, feel free to move this to your section of the kernel
:)

thanks,

greg k-h