diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:53:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:53:12 -0700 |
commit | b5f0adbcc4f16e378882d8f68fe3111df04911be (patch) | |
tree | b4326ed528a0962abe9e0bf783f687b3b23e4896 | |
parent | 0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (diff) | |
parent | 5b2fc499917e5897a13add780e181b4cef197072 (diff) |
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.
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Makefile | 8 | ||||
-rw-r--r-- | drivers/net/usb/Kconfig (renamed from drivers/usb/net/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/net/usb/Makefile (renamed from drivers/usb/net/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/usb/asix.c (renamed from drivers/usb/net/asix.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/catc.c (renamed from drivers/usb/net/catc.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/cdc_ether.c (renamed from drivers/usb/net/cdc_ether.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/cdc_subset.c (renamed from drivers/usb/net/cdc_subset.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/dm9601.c (renamed from drivers/usb/net/dm9601.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/gl620a.c (renamed from drivers/usb/net/gl620a.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/kaweth.c (renamed from drivers/usb/net/kaweth.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/kawethfw.h (renamed from drivers/usb/net/kawethfw.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/mcs7830.c (renamed from drivers/usb/net/mcs7830.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/net1080.c (renamed from drivers/usb/net/net1080.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.c (renamed from drivers/usb/net/pegasus.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.h (renamed from drivers/usb/net/pegasus.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/plusb.c (renamed from drivers/usb/net/plusb.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/rndis_host.c (renamed from drivers/usb/net/rndis_host.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/rtl8150.c (renamed from drivers/usb/net/rtl8150.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c (renamed from drivers/usb/net/usbnet.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.h (renamed from drivers/usb/net/usbnet.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/zaurus.c (renamed from drivers/usb/net/zaurus.c) | 0 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/Makefile | 7 |
24 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b86ccd2ecd5..d9842d8544d 100644 --- 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 index 59c0459a037..c5d8423573b 100644 --- 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 b/drivers/net/usb/Kconfig index 3de564b2314..3de564b2314 100644 --- a/drivers/usb/net/Kconfig +++ b/drivers/net/usb/Kconfig diff --git a/drivers/usb/net/Makefile b/drivers/net/usb/Makefile index 595a539f838..595a539f838 100644 --- a/drivers/usb/net/Makefile +++ b/drivers/net/usb/Makefile diff --git a/drivers/usb/net/asix.c b/drivers/net/usb/asix.c index d5ef97bc4d0..d5ef97bc4d0 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/net/usb/asix.c diff --git a/drivers/usb/net/catc.c b/drivers/net/usb/catc.c index 86e90c59d55..86e90c59d55 100644 --- a/drivers/usb/net/catc.c +++ b/drivers/net/usb/catc.c diff --git a/drivers/usb/net/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 5a21f06bf8a..5a21f06bf8a 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c diff --git a/drivers/usb/net/cdc_subset.c b/drivers/net/usb/cdc_subset.c index bc62b012602..bc62b012602 100644 --- a/drivers/usb/net/cdc_subset.c +++ b/drivers/net/usb/cdc_subset.c diff --git a/drivers/usb/net/dm9601.c b/drivers/net/usb/dm9601.c index a6763860147..a6763860147 100644 --- a/drivers/usb/net/dm9601.c +++ b/drivers/net/usb/dm9601.c diff --git a/drivers/usb/net/gl620a.c b/drivers/net/usb/gl620a.c index 031cf5ca4db..031cf5ca4db 100644 --- a/drivers/usb/net/gl620a.c +++ b/drivers/net/usb/gl620a.c diff --git a/drivers/usb/net/kaweth.c b/drivers/net/usb/kaweth.c index 60d29440f31..60d29440f31 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/net/usb/kaweth.c diff --git a/drivers/usb/net/kawethfw.h b/drivers/net/usb/kawethfw.h index cf85fcb0d1a..cf85fcb0d1a 100644 --- a/drivers/usb/net/kawethfw.h +++ b/drivers/net/usb/kawethfw.h diff --git a/drivers/usb/net/mcs7830.c b/drivers/net/usb/mcs7830.c index 6240b978fe3..6240b978fe3 100644 --- a/drivers/usb/net/mcs7830.c +++ b/drivers/net/usb/mcs7830.c diff --git a/drivers/usb/net/net1080.c b/drivers/net/usb/net1080.c index 19bf8dae70c..19bf8dae70c 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/net/usb/net1080.c diff --git a/drivers/usb/net/pegasus.c b/drivers/net/usb/pegasus.c index a05fd97e5bc..a05fd97e5bc 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/net/usb/pegasus.c diff --git a/drivers/usb/net/pegasus.h b/drivers/net/usb/pegasus.h index c7467823cd1..c7467823cd1 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/net/usb/pegasus.h diff --git a/drivers/usb/net/plusb.c b/drivers/net/usb/plusb.c index 45300939d18..45300939d18 100644 --- a/drivers/usb/net/plusb.c +++ b/drivers/net/usb/plusb.c diff --git a/drivers/usb/net/rndis_host.c b/drivers/net/usb/rndis_host.c index 980e4aaa97a..980e4aaa97a 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/net/usb/rndis_host.c diff --git a/drivers/usb/net/rtl8150.c b/drivers/net/usb/rtl8150.c index fa598f0340c..fa598f0340c 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/net/usb/rtl8150.c diff --git a/drivers/usb/net/usbnet.c b/drivers/net/usb/usbnet.c index f9cd42d058b..f9cd42d058b 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/net/usb/usbnet.c diff --git a/drivers/usb/net/usbnet.h b/drivers/net/usb/usbnet.h index 82db5a8e528..82db5a8e528 100644 --- a/drivers/usb/net/usbnet.h +++ b/drivers/net/usb/usbnet.h diff --git a/drivers/usb/net/zaurus.c b/drivers/net/usb/zaurus.c index 9f98e8ce487..9f98e8ce487 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/net/usb/zaurus.c diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index b847bbc8b0e..278a22cea5b 100644 --- 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 index 0ef090b1b37..72464b58699 100644 --- 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/ |