diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:34:00 -0700 |
| commit | 9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57 (patch) | |
| tree | 86a0f4606209b21a1ba2c33c61472127a9bfe170 /drivers/usb/Makefile | |
| parent | 970e2dfa672b5b26967b0983e24b8d92f972c907 (diff) | |
| parent | a9475226977917afd5a85621f8a3d7f380a9da31 (diff) | |
| download | kernel_samsung_smdk4412-9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57.zip kernel_samsung_smdk4412-9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57.tar.gz kernel_samsung_smdk4412-9f8e35fc0c1d96e5383eca5f0c7c963a9fadef57.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: "sparse" cleanups for usb gadgets
usb-serial: Fix edgeport regression on non-EPiC devices
USB: more pxa2xx_udc dead code removal
USB: NIKON D50 is an unusual device
USB: drivers/usb/serial/sierra.c: make 3 functions static
USB: fix BUG: sleeping function called from invalid context at /home/jeremy/hg/xen/paravirt/linux/drivers/usb/core/urb.c:524, in_atomic():1, irqs_disabled():0
USB: mct_u232: Convert to proper speed handling API
digi_acceleport: Drag the driver kicking and screaming into coding style
cp2101: Remove broken termios optimisation, use proper speed API
USB: Fix a bug in usb_start_wait_urb
USB: fix scatterlist PIO case (IOMMU)
USB: fix usb_serial_suspend(): buggy code
USB: yet another quirky device
USB: Add CanonScan LiDE30 to the quirk list
USB: even more quirks
USB: usb.h kernel-doc additions
USB: more quirky devices
USB: Don't let usb-storage steal Blackberry Pearl
USB: devices misc: Trivial patch to build the IOWARRIOR when it is selected in Kconfig
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index befff5f..ac49b15 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -48,6 +48,7 @@ obj-$(CONFIG_USB_SISUSBVGA) += misc/ obj-$(CONFIG_USB_TEST) += misc/ obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/ obj-$(CONFIG_USB_USS720) += misc/ +obj-$(CONFIG_USB_IOWARRIOR) += misc/ obj-$(CONFIG_USB_ATM) += atm/ obj-$(CONFIG_USB_SPEEDTOUCH) += atm/ |