aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/usb/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-08 02:48:30 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-08 02:48:30 -0700
commit22f6dacdfcfdc792d068e9c41234808860498d04 (patch)
tree281a7d476f256ea3e2f800177ba685b169cc0540 /drivers/net/usb/Makefile
parent928f308f556f4943e50c5064b546f47bce301f02 (diff)
parent9b05126baa146fc3f41360164141d4e1b3ea93c4 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: include/net/tcp.h
Diffstat (limited to 'drivers/net/usb/Makefile')
-rw-r--r--drivers/net/usb/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index f4402a06e52..b870b0b1cbe 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB_RTL8150) += rtl8150.o
obj-$(CONFIG_USB_HSO) += hso.o
obj-$(CONFIG_USB_NET_AX8817X) += asix.o
obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o
+obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
obj-$(CONFIG_USB_NET_DM9601) += dm9601.o
obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o
obj-$(CONFIG_USB_NET_GL620A) += gl620a.o