diff options
| author | Greg Kroah-Hartman | 2013-10-24 17:18:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-10-24 17:18:40 +0200 |
| commit | 5328f35b1584a9849ffe46afa42018946aa43851 (patch) | |
| tree | f939d0577ae13ed22069ac4188ce21bacc7a3af5 /drivers/usb/phy/Makefile | |
| parent | phy: exynos-mipi-video: Fix phy_power_off() callback (diff) | |
| parent | usb: phy: twl6030-usb: Include linux/of.h header (diff) | |
| download | kernel-qcow2-linux-5328f35b1584a9849ffe46afa42018946aa43851.tar.gz kernel-qcow2-linux-5328f35b1584a9849ffe46afa42018946aa43851.tar.xz kernel-qcow2-linux-5328f35b1584a9849ffe46afa42018946aa43851.zip | |
Merge tag 'usb-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.13
Final conversions to configfs for mass storage, acm_ms, and
multi gadgets.
MUSB should now work out of the box on AM335x-based boards
(beagle bone white and black) with DMA thanks to Sebastian's
work.
We can now enable VERBOSE_DEBUG on builds of drivers/usb/gadget/
by selecting CONFIG_USB_GADGET_VERBOSE.
s3c-hsotg got quite a few non-critical fixes but also learned
a few new tricks (isochronous transfers, multi count support).
The Marvel USB3 Controller driver got a memory leak fix.
devm_usb_get_phy() learned not to return NULL, ever.
Other than these patches, we have the usual set of cleanups
ranging from removal of unnecessary *_set_drvdata() to using
SIMPLE_DEV_PM_OPS.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/phy/Makefile')
| -rw-r--r-- | drivers/usb/phy/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile index 9c3736109c2c..022c1da7fb78 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile @@ -27,5 +27,6 @@ obj-$(CONFIG_USB_MSM_OTG) += phy-msm-usb.o obj-$(CONFIG_USB_MV_OTG) += phy-mv-usb.o obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-usb.o obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o +obj-$(CONFIG_USB_RCAR_GEN2_PHY) += phy-rcar-gen2-usb.o obj-$(CONFIG_USB_ULPI) += phy-ulpi.o obj-$(CONFIG_USB_ULPI_VIEWPORT) += phy-ulpi-viewport.o |