diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 20:07:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 20:07:21 -0400 |
| commit | 42e3a58b028e0e51746f596a11abfec01cd1c5c4 (patch) | |
| tree | b2dd1e8730359dc312519bcdaed9c52bae622990 /drivers/usb/misc/Makefile | |
| parent | 4fd48b45ffc4addd3c2963448b05417aa14abbf7 (diff) | |
| parent | 00fe52deb45b1a5ef42b0aa82e632e2df012eddc (diff) | |
Merge tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB driver updates from Greg KH:
"Here's the big USB (and PHY) driver patchset for 4.1-rc1.
Everything here has been in linux-next, and the full details are below
in the shortlog. Nothing major, just the normal round of new
drivers,api updates, and other changes, mostly in the USB gadget area,
as usual"
* tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (252 commits)
drivers/usb/core: devio.c: Removed an uneeded space before tab
usb: dwc2: host: sleep USB_RESUME_TIMEOUT during resume
usb: chipidea: debug: add low power mode check before print registers
usb: chipidea: udc: bypass pullup DP when gadget connect in OTG fsm mode
usb: core: hub: use new USB_RESUME_TIMEOUT
usb: isp1760: hcd: use new USB_RESUME_TIMEOUT
usb: dwc2: hcd: use new USB_RESUME_TIMEOUT
usb: host: sl811: use new USB_RESUME_TIMEOUT
usb: host: r8a66597: use new USB_RESUME_TIMEOUT
usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
usb: host: fusbh200: use new USB_RESUME_TIMEOUT
usb: host: fotg210: use new USB_RESUME_TIMEOUT
usb: host: isp116x: use new USB_RESUME_TIMEOUT
usb: musb: use new USB_RESUME_TIMEOUT
usb: host: uhci: use new USB_RESUME_TIMEOUT
usb: host: ehci: use new USB_RESUME_TIMEOUT
usb: host: xhci: use new USB_RESUME_TIMEOUT
usb: define a generic USB_RESUME_TIMEOUT macro
usb: musb: dsps: fix build on i386 when COMPILE_TEST is set
ehci-hub: use USB_DT_HUB
...
Diffstat (limited to 'drivers/usb/misc/Makefile')
| -rw-r--r-- | drivers/usb/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 65b0402c1ca1..45fd4ac39d3e 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
| @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_USS720) += uss720.o | |||
| 25 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o | 25 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o |
| 26 | obj-$(CONFIG_USB_YUREX) += yurex.o | 26 | obj-$(CONFIG_USB_YUREX) += yurex.o |
| 27 | obj-$(CONFIG_USB_HSIC_USB3503) += usb3503.o | 27 | obj-$(CONFIG_USB_HSIC_USB3503) += usb3503.o |
| 28 | obj-$(CONFIG_USB_CHAOSKEY) += chaoskey.o | ||
| 28 | 29 | ||
| 29 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ | 30 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ |
| 30 | obj-$(CONFIG_USB_LINK_LAYER_TEST) += lvstest.o | 31 | obj-$(CONFIG_USB_LINK_LAYER_TEST) += lvstest.o |