diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
| commit | 33f9936b2b73dba6c8685994c441c4fd30b04814 (patch) | |
| tree | 9ce8105bc1e44ba66276695927b15df0d3fc185d /drivers/net/phy/phy.c | |
| parent | aca51397d01474f80cab8fc978559b45f2e453ad (diff) | |
| parent | f227ec3ca2b7be449fb2156e82b40cceed87a34a (diff) | |
| download | op-kernel-dev-33f9936b2b73dba6c8685994c441c4fd30b04814.zip op-kernel-dev-33f9936b2b73dba6c8685994c441c4fd30b04814.tar.gz | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 3c18bb5..45cc291 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -547,7 +547,7 @@ static void phy_force_reduction(struct phy_device *phydev) * Must not be called from interrupt context, or while the * phydev->lock is held. */ -void phy_error(struct phy_device *phydev) +static void phy_error(struct phy_device *phydev) { mutex_lock(&phydev->lock); phydev->state = PHY_HALTED; |
