diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-24 04:03:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-24 04:03:51 +0200 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/usb/Makefile | |
| parent | Fix typos in comments in via-velocity header. (diff) | |
| parent | ixgbe: remove unnecessary call to device_init_wakeup (diff) | |
| download | linux-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.xz linux-74d154189d597b91da4322996dbf4f5c3d1544ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/net/usb/Makefile')
| -rw-r--r-- | drivers/net/usb/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index b870b0b1cbe0..e17afb78f372 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -21,4 +21,5 @@ obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o obj-$(CONFIG_USB_USBNET) += usbnet.o obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o +obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o |