diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:53:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:53:12 -0400 |
| commit | b5f0adbcc4f16e378882d8f68fe3111df04911be (patch) | |
| tree | b4326ed528a0962abe9e0bf783f687b3b23e4896 /drivers/net/Makefile | |
| 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.
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
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/ | |||
| 206 | obj-$(CONFIG_WAN) += wan/ | 206 | obj-$(CONFIG_WAN) += wan/ |
| 207 | obj-$(CONFIG_ARCNET) += arcnet/ | 207 | obj-$(CONFIG_ARCNET) += arcnet/ |
| 208 | obj-$(CONFIG_NET_PCMCIA) += pcmcia/ | 208 | obj-$(CONFIG_NET_PCMCIA) += pcmcia/ |
| 209 | |||
| 210 | obj-$(CONFIG_USB_CATC) += usb/ | ||
| 211 | obj-$(CONFIG_USB_KAWETH) += usb/ | ||
| 212 | obj-$(CONFIG_USB_PEGASUS) += usb/ | ||
| 213 | obj-$(CONFIG_USB_RTL8150) += usb/ | ||
| 214 | obj-$(CONFIG_USB_USBNET) += usb/ | ||
| 215 | obj-$(CONFIG_USB_ZD1201) += usb/ | ||
| 216 | |||
| 209 | obj-y += wireless/ | 217 | obj-y += wireless/ |
| 210 | obj-$(CONFIG_NET_TULIP) += tulip/ | 218 | obj-$(CONFIG_NET_TULIP) += tulip/ |
| 211 | obj-$(CONFIG_HAMRADIO) += hamradio/ | 219 | obj-$(CONFIG_HAMRADIO) += hamradio/ |