diff options
author | Greg Kroah-Hartman | 2015-08-15 01:45:51 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-08-15 01:45:51 +0200 |
commit | d50f14805ec0f1cf50654e23559d1dcf81c68b26 (patch) | |
tree | 9e705250a24ffccad8af4c3b1c4386ae508b0c87 /drivers/phy/Makefile | |
parent | Merge tag 'usb-ci-v4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | phy: lpc18xx-usb-otg: fix clock order in phy init (diff) | |
download | kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.tar.gz kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.tar.xz kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.zip |
Merge tag 'phy-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
phy: for 4.3
*) Add new NXP USB OTG PHY driver
*) Add vbus/id detection, extcon support and fixes in phy-sun4i-usb
driver
*) Add support to use phy-sun4i-usb driver for sun8i-a23 and sun8i-a33
SoCs
*) Other trivial code cleanups, dropping .owner assignment and constify
phy_ops
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/Makefile')
-rw-r--r-- | drivers/phy/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index f344e1b2e825..a5b18c18fc12 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o +obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o |