diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/net/sungem.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 1f5655655c40..2608e7a3d214 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -3079,7 +3079,9 @@ static int __devinit gem_init_one(struct pci_dev *pdev, | |||
| 3079 | gp->phy_mii.dev = dev; | 3079 | gp->phy_mii.dev = dev; |
| 3080 | gp->phy_mii.mdio_read = _phy_read; | 3080 | gp->phy_mii.mdio_read = _phy_read; |
| 3081 | gp->phy_mii.mdio_write = _phy_write; | 3081 | gp->phy_mii.mdio_write = _phy_write; |
| 3082 | 3082 | #ifdef CONFIG_PPC_PMAC | |
| 3083 | gp->phy_mii.platform_data = gp->of_node; | ||
| 3084 | #endif | ||
| 3083 | /* By default, we start with autoneg */ | 3085 | /* By default, we start with autoneg */ |
| 3084 | gp->want_autoneg = 1; | 3086 | gp->want_autoneg = 1; |
| 3085 | 3087 | ||