diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
| commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
| tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /drivers/net/phy/phy.c | |
| parent | 5bf6c6e30d8b71d092e8830208e182d84b907fcd (diff) | |
| parent | da109897a142dd017172c0ce7abf0be8646f7109 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
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 3c18bb594957..45cc2914d347 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) | |||
| 547 | * Must not be called from interrupt context, or while the | 547 | * Must not be called from interrupt context, or while the |
| 548 | * phydev->lock is held. | 548 | * phydev->lock is held. |
| 549 | */ | 549 | */ |
| 550 | void phy_error(struct phy_device *phydev) | 550 | static void phy_error(struct phy_device *phydev) |
| 551 | { | 551 | { |
| 552 | mutex_lock(&phydev->lock); | 552 | mutex_lock(&phydev->lock); |
| 553 | phydev->state = PHY_HALTED; | 553 | phydev->state = PHY_HALTED; |