summaryrefslogtreecommitdiff
path: root/drivers/phy/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-03 08:13:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-03 08:13:41 +0300
commitb3d424e3dcbb5eba572baae30e1052b2fff7b51e (patch)
tree8055b6dca7b3cda1beffc6f5aee3a7602daef09b /drivers/phy/Makefile
parentf50420223071b6ff4b586308f5c27eec54694a81 (diff)
parent692fbb89fa0b8028f402e33eb912474e11b5f435 (diff)
downloadlinux-b3d424e3dcbb5eba572baae30e1052b2fff7b51e.tar.xz
Merge tag 'phy-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes: phy: for 4.2 merge window *) new Broadcom SATA3 PHY driver for Broadcom STB SoCs *) new phy API to get PHY by index which is used in EHCI and OHCI controller drivers *) support specifying supply at port level used for multi-port PHYs *) sparse warning fixes in miphy PHYs *) fix pm_runtime issues in twl4030 driver Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/Makefile')
-rw-r--r--drivers/phy/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 0a2041803135..bc92b427e5ca 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -41,3 +41,4 @@ obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o
+obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o