diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2018-03-20 17:31:10 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-22 13:02:47 -0400 |
| commit | 40013ff20b1beed31184935fc0aea6a859d4d4ef (patch) | |
| tree | cc3a9b0b71d07e99a821cebcaf1396e8078f4bd9 /drivers/net/dsa | |
| parent | Merge branch 'hv_netvsc-fix-races-during-shutdown-and-changes' (diff) | |
| download | linux-dev-40013ff20b1beed31184935fc0aea6a859d4d4ef.tar.xz linux-dev-40013ff20b1beed31184935fc0aea6a859d4d4ef.zip | |
net: dsa: Fix functional dsa-loop dependency on FIXED_PHY
We have a functional dependency on the FIXED_PHY MDIO bus because we register
fixed PHY devices "the old way" which only works if the code that does this has
had a chance to run before the fixed MDIO bus is probed. Make sure we account
for that and have dsa_loop_bdinfo.o be either built-in or modular depending on
whether CONFIG_FIXED_PHY reflects that too.
Fixes: 98cd1552ea27 ("net: dsa: Mock-up driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index d040aeb45172..15c2a831edf1 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -1,7 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o -obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o dsa_loop_bdinfo.o +obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o +ifdef CONFIG_NET_DSA_LOOP +obj-$(CONFIG_FIXED_PHY) += dsa_loop_bdinfo.o +endif obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o |