diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 21:49:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 21:49:13 +0200 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /drivers/net/Makefile | |
| parent | net: suppress RCU lockdep false positive in twsk_net() (diff) | |
| parent | cxgb3: Wait longer for control packets on initialization (diff) | |
| download | linux-e1703b36c358dde24ececba4fd609ecd91433ba3.tar.xz linux-e1703b36c358dde24ececba4fd609ecd91433ba3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index ebf80b983063..0a0512ae77da 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -273,6 +273,7 @@ obj-$(CONFIG_USB_RTL8150) += usb/ obj-$(CONFIG_USB_HSO) += usb/ obj-$(CONFIG_USB_USBNET) += usb/ obj-$(CONFIG_USB_ZD1201) += usb/ +obj-$(CONFIG_USB_IPHETH) += usb/ obj-y += wireless/ obj-$(CONFIG_NET_TULIP) += tulip/ |