Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/gi…

…t/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.
git-mirror · May 10, 2007 · b5f0adb · b5f0adb
2 parents 0a09d9a + 5b2fc49
commit b5f0adb
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 9 deletions.
diff --git 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"

diff --git 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/

diff --git a/drivers/usb/net/Kconfig → drivers/net/usb/Kconfig b/drivers/usb/net/Kconfig → drivers/net/usb/Kconfig
diff --git a/drivers/usb/net/Makefile → drivers/net/usb/Makefile b/drivers/usb/net/Makefile → drivers/net/usb/Makefile
diff --git a/drivers/usb/net/asix.c → drivers/net/usb/asix.c b/drivers/usb/net/asix.c → drivers/net/usb/asix.c
diff --git a/drivers/usb/net/catc.c → drivers/net/usb/catc.c b/drivers/usb/net/catc.c → drivers/net/usb/catc.c
diff --git a/drivers/usb/net/cdc_ether.c → drivers/net/usb/cdc_ether.c b/drivers/usb/net/cdc_ether.c → drivers/net/usb/cdc_ether.c
diff --git a/drivers/usb/net/cdc_subset.c → drivers/net/usb/cdc_subset.c b/drivers/usb/net/cdc_subset.c → drivers/net/usb/cdc_subset.c
diff --git a/drivers/usb/net/dm9601.c → drivers/net/usb/dm9601.c b/drivers/usb/net/dm9601.c → drivers/net/usb/dm9601.c
diff --git a/drivers/usb/net/gl620a.c → drivers/net/usb/gl620a.c b/drivers/usb/net/gl620a.c → drivers/net/usb/gl620a.c
diff --git a/drivers/usb/net/kaweth.c → drivers/net/usb/kaweth.c b/drivers/usb/net/kaweth.c → drivers/net/usb/kaweth.c
diff --git a/drivers/usb/net/kawethfw.h → drivers/net/usb/kawethfw.h b/drivers/usb/net/kawethfw.h → drivers/net/usb/kawethfw.h
diff --git a/drivers/usb/net/mcs7830.c → drivers/net/usb/mcs7830.c b/drivers/usb/net/mcs7830.c → drivers/net/usb/mcs7830.c
diff --git a/drivers/usb/net/net1080.c → drivers/net/usb/net1080.c b/drivers/usb/net/net1080.c → drivers/net/usb/net1080.c
diff --git a/drivers/usb/net/pegasus.c → drivers/net/usb/pegasus.c b/drivers/usb/net/pegasus.c → drivers/net/usb/pegasus.c
diff --git a/drivers/usb/net/pegasus.h → drivers/net/usb/pegasus.h b/drivers/usb/net/pegasus.h → drivers/net/usb/pegasus.h
diff --git a/drivers/usb/net/plusb.c → drivers/net/usb/plusb.c b/drivers/usb/net/plusb.c → drivers/net/usb/plusb.c
diff --git a/drivers/usb/net/rndis_host.c → drivers/net/usb/rndis_host.c b/drivers/usb/net/rndis_host.c → drivers/net/usb/rndis_host.c
diff --git a/drivers/usb/net/rtl8150.c → drivers/net/usb/rtl8150.c b/drivers/usb/net/rtl8150.c → drivers/net/usb/rtl8150.c
diff --git a/drivers/usb/net/usbnet.c → drivers/net/usb/usbnet.c b/drivers/usb/net/usbnet.c → drivers/net/usb/usbnet.c
diff --git a/drivers/usb/net/usbnet.h → drivers/net/usb/usbnet.h b/drivers/usb/net/usbnet.h → drivers/net/usb/usbnet.h
diff --git a/drivers/usb/net/zaurus.c → drivers/net/usb/zaurus.c b/drivers/usb/net/zaurus.c → drivers/net/usb/zaurus.c
diff --git 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"

diff --git 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/