diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-08-31 17:46:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:53:37 -0700 |
| commit | e451d7b22013a95c725e581fd83da0d9c6d79445 (patch) | |
| tree | e9b0eca6d4f5ec3db11240c882169fc9d05ad054 /drivers/staging/et131x/et131x_initpci.c | |
| parent | ce92b7ad6c718b1e228e83137af87ed8c558d358 (diff) | |
staging: et131x: Use MII register defines from mii.h
Use defines from include/linux/mii.h instead of et131x_phy.h and delete the latter defines.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_initpci.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 6ffebfadcf9f..2ef2a7062417 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -249,14 +249,14 @@ void et131x_error_timer_handler(unsigned long data) dev_err(&adapter->pdev->dev, "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr); - if (!(adapter->bmsr & MI_BMSR_LINK_STATUS) && + if (!(adapter->bmsr & BMSR_LSTATUS) && adapter->registry_phy_coma && adapter->boot_coma < 11) { adapter->boot_coma++; } if (adapter->boot_coma == 10) { - if (!(adapter->bmsr & MI_BMSR_LINK_STATUS) + if (!(adapter->bmsr & BMSR_LSTATUS) && adapter->registry_phy_coma) { if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) { /* NOTE - This was originally a 'sync with |