Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Move USB network drivers to drivers/net/usb.
2007-05-09 18:53:12 -07:00 · 2007-05-09 18:53:12 -07:00 · b5f0adbcc4
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@ -2499,6 +2499,8 @@ source "drivers/net/tokenring/Kconfig"

 source "drivers/net/wireless/Kconfig"

+source "drivers/net/usb/Kconfig"
+
 source "drivers/net/pcmcia/Kconfig"

 source "drivers/net/wan/Kconfig"
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_NET_PCMCIA) += pcmcia/
+
+obj-$(CONFIG_USB_CATC)          += usb/
+obj-$(CONFIG_USB_KAWETH)        += usb/
+obj-$(CONFIG_USB_PEGASUS)       += usb/
+obj-$(CONFIG_USB_RTL8150)       += usb/
+obj-$(CONFIG_USB_USBNET)        += usb/
+obj-$(CONFIG_USB_ZD1201)        += usb/
+
 obj-y += wireless/
 obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
--- a/drivers/net/usb/gl620a.c
+++ b/drivers/net/usb/gl620a.c
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
--- a/drivers/net/usb/kawethfw.h
+++ b/drivers/net/usb/kawethfw.h
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
--- a/drivers/net/usb/usbnet.h
+++ b/drivers/net/usb/usbnet.h
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@ -87,8 +87,6 @@ source "drivers/usb/storage/Kconfig"

 source "drivers/usb/image/Kconfig"

-source "drivers/usb/net/Kconfig"
-
 source "drivers/usb/mon/Kconfig"

 comment "USB port drivers"
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER)	+= class/
 obj-$(CONFIG_USB_STORAGE)	+= storage/
 obj-$(CONFIG_USB)		+= storage/

-obj-$(CONFIG_USB_CATC)		+= net/
-obj-$(CONFIG_USB_KAWETH)	+= net/
-obj-$(CONFIG_USB_PEGASUS)	+= net/
-obj-$(CONFIG_USB_RTL8150)	+= net/
-obj-$(CONFIG_USB_USBNET)	+= net/
-obj-$(CONFIG_USB_ZD1201)	+= net/
-
 obj-$(CONFIG_USB_MDC800)	+= image/
 obj-$(CONFIG_USB_MICROTEK)	+= image/