diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-20 15:42:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-20 15:42:23 -0400 |
| commit | 460edb3cd06865ffb231eb694b567daec3113210 (patch) | |
| tree | 5822da2ced52195772c1edcda20a881855bd2398 /drivers/net/phy/phy.c | |
| parent | be7963b7e7f08a149e247c0bf29a4abd174e0929 (diff) | |
| parent | faf60e72d07d163a623e47269680918fccaa789a (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
sky2: version 1.18
sky2: receive FIFO checking
sky2: fe+ chip support
sky2: reorganize chip revision features
sky2: ethtool speed report bug
sky2: fix VLAN receive processing (resend)
phy: export phy_mii_ioctl
myri10ge: Add support for PCI device id 9
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 0cc4369cacba..cb230f44d6fc 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -409,6 +409,7 @@ int phy_mii_ioctl(struct phy_device *phydev, | |||
| 409 | 409 | ||
| 410 | return 0; | 410 | return 0; |
| 411 | } | 411 | } |
| 412 | EXPORT_SYMBOL(phy_mii_ioctl); | ||
| 412 | 413 | ||
| 413 | /** | 414 | /** |
| 414 | * phy_start_aneg - start auto-negotiation for this PHY device | 415 | * phy_start_aneg - start auto-negotiation for this PHY device |