aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/Makefile
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-05-13 08:41:55 -0700
committerJakub Kicinski <kuba@kernel.org>2024-05-13 18:35:02 -0700
commit5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 (patch)
treeb3d5581d2c038fa2288ac941f531955c699682ed /drivers/net/phy/Makefile
parentMerge branch 'move-est-lock-and-est-structure-to-struct-stmmac_priv' (diff)
downloadlinux-5c1672705a1a2389f5ad78e0fea6f08ed32d6f18.tar.xz
linux-5c1672705a1a2389f5ad78e0fea6f08ed32d6f18.zip
net: revert partially applied PHY topology series
The series is causing issues with PHY drivers built as modules. Since it was only partially applied and the merge window has opened let's revert and try again for v6.11. Revert 6916e461e793 ("net: phy: Introduce ethernet link topology representation") Revert 0ec5ed6c130e ("net: sfp: pass the phy_device when disconnecting an sfp module's PHY") Revert e75e4e074c44 ("net: phy: add helpers to handle sfp phy connect/disconnect") Revert fdd353965b52 ("net: sfp: Add helper to return the SFP bus name") Revert 841942bc6212 ("net: ethtool: Allow passing a phy index for some commands") Link: https://lore.kernel.org/all/171242462917.4000.9759453824684907063.git-patchwork-notify@kernel.org/ Link: https://lore.kernel.org/all/20240507102822.2023826-1-maxime.chevallier@bootlin.com/ Link: https://lore.kernel.org/r/20240513154156.104281-1-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy/Makefile')
-rw-r--r--drivers/net/phy/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 1d8be374915f..202ed7f450da 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -2,7 +2,7 @@
# Makefile for Linux PHY drivers
libphy-y := phy.o phy-c45.o phy-core.o phy_device.o \
- linkmode.o phy_link_topology.o
+ linkmode.o
mdio-bus-y += mdio_bus.o mdio_device.o
ifdef CONFIG_MDIO_DEVICE