diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/phy/Makefile | |
parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
download | linux-855e7e7174bade3f2b63077a81eea5aab525dbf6.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/phy/Makefile')
-rw-r--r-- | drivers/phy/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index aa74f961e44e..cfbb72064516 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -34,3 +34,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o obj-$(CONFIG_PHY_XGENE) += phy-xgene.o obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o +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 |