Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e2f6fe authored by David S. Miller's avatar David S. Miller
Browse files

net: Fix sungem_phy sharing. 



Since sungem_phy is used by multiple, unrelated, drivers make it
build as a real module under drivers/net.

depmod will pick up the symbol dependency and make sure sungem_phy.ko
gets loaded any time sungem.ko or spider_net.ko is loaded.

Tested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef37d38a

drivers/net/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -186,6 +186,9 @@ config MII 


source "drivers/net/phy/Kconfig"



config SUNGEM_PHY

	tristate



#

#	Ethernet

#

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -75,3 +75,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o 


obj-$(CONFIG_WIMAX) += wimax/

obj-$(CONFIG_CAIF) += caif/



obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

drivers/net/ethernet/sun/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ obj-$(CONFIG_HAPPYMEAL) += sunhme.o 
obj-$(CONFIG_SUNQE) += sunqe.o

obj-$(CONFIG_SUNBMAC) += sunbmac.o

obj-$(CONFIG_SUNGEM) += sungem.o

obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

obj-$(CONFIG_CASSINI) += cassini.o

obj-$(CONFIG_SUNVNET) += sunvnet.o

obj-$(CONFIG_NIU) += niu.o

drivers/net/ethernet/sun/sungem.c

+1 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ static void gem_init_phy(struct gem *gp) 
	if (gp->phy_type == phy_mii_mdio0 ||

	    gp->phy_type == phy_mii_mdio1) {

		/* Reset and detect MII PHY */

		mii_phy_probe(&gp->phy_mii, gp->mii_phy_addr);

		sungem_phy_probe(&gp->phy_mii, gp->mii_phy_addr);



		/* Init PHY */

		if (gp->phy_mii.def && gp->phy_mii.def->ops->init)

drivers/net/ethernet/toshiba/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ obj-$(CONFIG_GELIC_NET) += ps3_gelic.o 
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o

ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)

spidernet-y += spider_net.o spider_net_ethtool.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o

obj-$(CONFIG_TC35815) += tc35815.o