Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1157120 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-06-03 08:50 +0200 |
| Last post | 2015-06-03 08:50 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the usb tree with the mips tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-03 08:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-06-03 08:50 +0200 |
| Subject | linux-next: manual merge of the usb tree with the mips tree |
| Message-ID | <pxaEV-186-9@gated-at.bofh.it> |
[Multipart message — attachments visible in raw view] — view raw
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
Back to top | Article view | linux.kernel
csiph-web