diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 08:50:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 08:50:15 -0700 |
| commit | b939e414f0dbd7ac8d38da2c7e3a419728229afd (patch) | |
| tree | 7d54bd66e249fa7432e1eac7ef303049621f7590 /drivers/usb/Makefile | |
| parent | deeb103412efcf9313e2d1dfe892fed4e372b9e7 (diff) | |
| parent | 29868b281f6d057b4cbe348f4483f1717c021c5c (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:
Revert "USB: Correct Makefile to make isp1760 buildable"
usb-serial: fix crash when sub-driver updates firmware
USB: isp1760: urb_dequeue doesn't always find the urbs
USB: Yet another Conexant Clone to add to cdc-acm.c
USB: atmel_usb_udc: Use kzalloc() to allocate ep structures
USB: atmel-usba-udc : fix control out requests.
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 0716cdb44cd..0a3dc5ece63 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_USB_MON) += mon/ obj-$(CONFIG_PCI) += host/ obj-$(CONFIG_USB_EHCI_HCD) += host/ obj-$(CONFIG_USB_ISP116X_HCD) += host/ -obj-$(CONFIG_USB_ISP1760_HCD) += host/ obj-$(CONFIG_USB_OHCI_HCD) += host/ obj-$(CONFIG_USB_UHCI_HCD) += host/ obj-$(CONFIG_USB_FHCI_HCD) += host/ |