Commit b5f0adbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 0a09d9a4 5b2fc499
...@@ -87,8 +87,6 @@ source "drivers/usb/storage/Kconfig" ...@@ -87,8 +87,6 @@ source "drivers/usb/storage/Kconfig"
source "drivers/usb/image/Kconfig" source "drivers/usb/image/Kconfig"
source "drivers/usb/net/Kconfig"
source "drivers/usb/mon/Kconfig" source "drivers/usb/mon/Kconfig"
comment "USB port drivers" comment "USB port drivers"
......
...@@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER) += class/ ...@@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER) += class/
obj-$(CONFIG_USB_STORAGE) += storage/ obj-$(CONFIG_USB_STORAGE) += storage/
obj-$(CONFIG_USB) += 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_MDC800) += image/
obj-$(CONFIG_USB_MICROTEK) += image/ obj-$(CONFIG_USB_MICROTEK) += image/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment