diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/phy/phy.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-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 f5aad77288f9..3af9fcf76c81 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -480,7 +480,7 @@ void phy_error(struct phy_device *phydev) | |||
| 480 | * description: When a PHY interrupt occurs, the handler disables | 480 | * description: When a PHY interrupt occurs, the handler disables |
| 481 | * interrupts, and schedules a work task to clear the interrupt. | 481 | * interrupts, and schedules a work task to clear the interrupt. |
| 482 | */ | 482 | */ |
| 483 | static irqreturn_t phy_interrupt(int irq, void *phy_dat, struct pt_regs *regs) | 483 | static irqreturn_t phy_interrupt(int irq, void *phy_dat) |
| 484 | { | 484 | { |
| 485 | struct phy_device *phydev = phy_dat; | 485 | struct phy_device *phydev = phy_dat; |
| 486 | 486 | ||