diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:49:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:49:10 -0400 |
| commit | 117494a1b65183f0e3fcc817b07944bc5c465050 (patch) | |
| tree | c375cf06bdf869f2b870fe61808b060c4fadab45 /drivers/usb/Makefile | |
| parent | 4d5709a7b7d54fc5882d2943a14988a92d48c00a (diff) | |
| parent | d1aa3e6aa8edfeb864af7c930523d9e588b28bea (diff) | |
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: (142 commits)
USB: fix race in autosuspend reschedule
atmel_usba_udc: Keep track of the device status
USB: Nikon D40X unusual_devs entry
USB: serial core should respect driver requirements
USB: documentation for USB power management
USB: skip autosuspended devices during system resume
USB: mutual exclusion for EHCI init and port resets
USB: allow usbstorage to have LUNS greater than 2Tb
USB: Adding support for SHARP WS011SH to ipaq.c
USB: add atmel_usba_udc driver
USB: ohci SSB bus glue
USB: ehci build fixes on au1xxx, ppc-soc
USB: add runtime frame_no quirk for big-endian OHCI
USB: funsoft: Fix termios
USB: visor: termios bits
USB: unusual_devs entry for Nikon DSC D2Xs
USB: re-remove <linux/usb_sl811.h>
USB: move <linux/usb_gadget.h> to <linux/usb/gadget.h>
USB: Export URB statistics for powertop
USB: serial gadget: Disable endpoints on unload
...
Diffstat (limited to 'drivers/usb/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index ac49b15fa768..516a6400db43 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
| @@ -28,27 +28,7 @@ obj-$(CONFIG_USB_MICROTEK) += image/ | |||
| 28 | 28 | ||
| 29 | obj-$(CONFIG_USB_SERIAL) += serial/ | 29 | obj-$(CONFIG_USB_SERIAL) += serial/ |
| 30 | 30 | ||
| 31 | obj-$(CONFIG_USB_ADUTUX) += misc/ | 31 | obj-$(CONFIG_USB) += misc/ |
| 32 | obj-$(CONFIG_USB_APPLEDISPLAY) += misc/ | ||
| 33 | obj-$(CONFIG_USB_AUERSWALD) += misc/ | ||
| 34 | obj-$(CONFIG_USB_BERRY_CHARGE) += misc/ | ||
| 35 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/ | ||
| 36 | obj-$(CONFIG_USB_CYTHERM) += misc/ | ||
| 37 | obj-$(CONFIG_USB_EMI26) += misc/ | ||
| 38 | obj-$(CONFIG_USB_EMI62) += misc/ | ||
| 39 | obj-$(CONFIG_USB_FTDI_ELAN) += misc/ | ||
| 40 | obj-$(CONFIG_USB_IDMOUSE) += misc/ | ||
| 41 | obj-$(CONFIG_USB_LCD) += misc/ | ||
| 42 | obj-$(CONFIG_USB_LD) += misc/ | ||
| 43 | obj-$(CONFIG_USB_LED) += misc/ | ||
| 44 | obj-$(CONFIG_USB_LEGOTOWER) += misc/ | ||
| 45 | obj-$(CONFIG_USB_PHIDGETSERVO) += misc/ | ||
| 46 | obj-$(CONFIG_USB_RIO500) += misc/ | ||
| 47 | obj-$(CONFIG_USB_SISUSBVGA) += misc/ | ||
| 48 | obj-$(CONFIG_USB_TEST) += misc/ | ||
| 49 | obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/ | ||
| 50 | obj-$(CONFIG_USB_USS720) += misc/ | ||
| 51 | obj-$(CONFIG_USB_IOWARRIOR) += misc/ | ||
| 52 | 32 | ||
| 53 | obj-$(CONFIG_USB_ATM) += atm/ | 33 | obj-$(CONFIG_USB_ATM) += atm/ |
| 54 | obj-$(CONFIG_USB_SPEEDTOUCH) += atm/ | 34 | obj-$(CONFIG_USB_SPEEDTOUCH) += atm/ |