diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:20:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:20:49 -0700 |
| commit | fd9908c078b30db393e9855fb96f804793af23ba (patch) | |
| tree | 1b7a6b097ce579c01b9c862b279683915bea21dc /drivers/usb/class/Makefile | |
| parent | 57312b75aa06b09c28acd9c5a9c70827da3696d2 (diff) | |
| parent | afba937e540c902c989cd516fd97ea0c8499bb27 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: CDC WDM driver
USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator
USB: serial: ch341: New VID/PID for CH341 USB-serial
USB: build fix
USB: pxa27x_udc - Fix Oops
USB: OPTION: fix name of Onda MSA501HS HSDPA modem
USB: add TELIT HDSPA UC864-E modem to option driver
usb-serial: Use ftdi_sio driver for RATOC REX-USB60F
Diffstat (limited to 'drivers/usb/class/Makefile')
| -rw-r--r-- | drivers/usb/class/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile index cc391e6c2af..535d59a3060 100644 --- a/drivers/usb/class/Makefile +++ b/drivers/usb/class/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_USB_ACM) += cdc-acm.o obj-$(CONFIG_USB_PRINTER) += usblp.o +obj-$(CONFIG_USB_WDM) += cdc-wdm.o |