diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 14:45:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 14:45:12 -0400 |
| commit | 0471448f4d017470995d8a2272dc8c06dbed3b77 (patch) | |
| tree | 39fd1a0ad4004052b9d7de0fbf57105af0da47bb /drivers/net/phy/vitesse.c | |
| parent | edd5cd4a9424f22b0fa08bef5e299d41befd5622 (diff) | |
| parent | 5f708dd91d15876e26d7a57f97a255cedffca463 (diff) | |
Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
phy: Fix phy_id for Vitesse 824x PHY
Diffstat (limited to 'drivers/net/phy/vitesse.c')
| -rw-r--r-- | drivers/net/phy/vitesse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index 792716beb052..596222b260d6 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c | |||
| @@ -84,7 +84,7 @@ static int vsc824x_config_intr(struct phy_device *phydev) | |||
| 84 | 84 | ||
| 85 | /* Vitesse 824x */ | 85 | /* Vitesse 824x */ |
| 86 | static struct phy_driver vsc8244_driver = { | 86 | static struct phy_driver vsc8244_driver = { |
| 87 | .phy_id = 0x000fc6c2, | 87 | .phy_id = 0x000fc6c0, |
| 88 | .name = "Vitesse VSC8244", | 88 | .name = "Vitesse VSC8244", |
| 89 | .phy_id_mask = 0x000fffc0, | 89 | .phy_id_mask = 0x000fffc0, |
| 90 | .features = PHY_GBIT_FEATURES, | 90 | .features = PHY_GBIT_FEATURES, |