summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-01-30 19:17:16 -0800
committerDavid S. Miller <davem@davemloft.net>2017-01-31 13:36:59 -0500
commit953046e1af0f188ffe7061ee05160318e7f9d0dd (patch)
treea32850d81bbbd65e00594ea29abe90511b69f6cd /drivers
parent0d909aa7c276584cc17413a7bec64d4fb5da2968 (diff)
downloadlinux-953046e1af0f188ffe7061ee05160318e7f9d0dd.tar.bz2
net: dsa: bcm_sf2: Fix build module
Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in doing so, we essentially just built this object and no longer bcm_sf2.o. Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o and bcm_sf2_cfp.o. Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/dsa/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index da9893478e21..a3c941632217 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm_sf2.o
-bcm_sf2-objs += bcm_sf2_cfp.o
+obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o
+bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o
obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o
obj-y += b53/