diff options
author | David S. Miller <davem@davemloft.net> | 2011-08-16 02:10:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-16 03:16:49 -0400 |
commit | 19e2f6fe9601ca5c846b7163e6d6d00f87b34760 (patch) | |
tree | 4c13d42b3aa0f8415f72bb075ac89841667a6cd9 /drivers/net/ethernet/toshiba/spider_net.c | |
parent | ef37d38a1fe78ba627b8178af02df31e59b18896 (diff) |
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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/toshiba/spider_net.c')
-rw-r--r-- | drivers/net/ethernet/toshiba/spider_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index 1ff3491c8240..af345dbd1210 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c | |||
@@ -196,7 +196,7 @@ spider_net_setup_aneg(struct spider_net_card *card) | |||
196 | if ((bmsr & BMSR_ESTATEN) && (estat & ESTATUS_1000_THALF)) | 196 | if ((bmsr & BMSR_ESTATEN) && (estat & ESTATUS_1000_THALF)) |
197 | advertise |= SUPPORTED_1000baseT_Half; | 197 | advertise |= SUPPORTED_1000baseT_Half; |
198 | 198 | ||
199 | mii_phy_probe(phy, phy->mii_id); | 199 | sungem_phy_probe(phy, phy->mii_id); |
200 | phy->def->ops->setup_aneg(phy, advertise); | 200 | phy->def->ops->setup_aneg(phy, advertise); |
201 | 201 | ||
202 | } | 202 | } |
@@ -2120,7 +2120,7 @@ spider_net_setup_phy(struct spider_net_card *card) | |||
2120 | unsigned short id; | 2120 | unsigned short id; |
2121 | id = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR); | 2121 | id = spider_net_read_phy(card->netdev, phy->mii_id, MII_BMSR); |
2122 | if (id != 0x0000 && id != 0xffff) { | 2122 | if (id != 0x0000 && id != 0xffff) { |
2123 | if (!mii_phy_probe(phy, phy->mii_id)) { | 2123 | if (!sungem_phy_probe(phy, phy->mii_id)) { |
2124 | pr_info("Found %s.\n", phy->def->name); | 2124 | pr_info("Found %s.\n", phy->def->name); |
2125 | break; | 2125 | break; |
2126 | } | 2126 | } |