lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the usb tree with the mips tree
Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
Pistachio USB2.0 PHY") from the mips tree and commit 1c14905ef951
("phy: add driver for TI TUSB1210 ULPI PHY") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/phy/Makefile
index 75a37dc952f5,0a2041803135..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -40,4 -40,4 +40,5 @@@ obj-$(CONFIG_PHY_STIH41X_USB) += phy-s
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_PISTACHIO_USB) += phy-pistachio-usb.o
+ obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-06-03 09:01    [W:0.027 / U:0.500 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site