diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2018-04-27 12:41:49 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-28 16:48:04 -0400 |
| commit | 9e8d438e8ba43a38def2890a65a26917f2233a83 (patch) | |
| tree | 6d6cc7e366c09f5dec715e502f47ac86bacb9f7b /drivers/net/phy/Kconfig | |
| parent | udp: remove stray export symbol (diff) | |
| download | linux-dev-9e8d438e8ba43a38def2890a65a26917f2233a83.tar.xz linux-dev-9e8d438e8ba43a38def2890a65a26917f2233a83.zip | |
net: phy: Fix modular PHYLIB build
After commit c59530d0d5dc ("net: Move PHY statistics code into PHY
library helpers") we made net/core/ethtool.c reference symbols which are
part of the library which can be modular. David introduced a temporary
fix with 1ecd6e8ad996 ("phy: Temporary build fix after phylib changes.")
which would prevent such modularity.
This is not desireable of course, so instead, just inline the functions
into include/linux/phy.h to keep both options available.
Fixes: c59530d0d5dc ("net: Move PHY statistics code into PHY library helpers")
Fixes: 1ecd6e8ad996 ("phy: Temporary build fix after phylib changes.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 7c5e8c1e9370..edb8b9ab827f 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -9,6 +9,7 @@ menuconfig MDIO_DEVICE config MDIO_BUS tristate + default m if PHYLIB=m default MDIO_DEVICE help This internal symbol is used for link time dependencies and it @@ -170,7 +171,7 @@ config PHYLINK autonegotiation modes. menuconfig PHYLIB - bool "PHY Device support and infrastructure" + tristate "PHY Device support and infrastructure" depends on NETDEVICES select MDIO_DEVICE help |