diff options
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 554836edd915..5e43ae751412 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -88,7 +88,7 @@ struct mii_bus { | |||
| 88 | 88 | ||
| 89 | /* A lock to ensure that only one thing can read/write | 89 | /* A lock to ensure that only one thing can read/write |
| 90 | * the MDIO bus at a time */ | 90 | * the MDIO bus at a time */ |
| 91 | spinlock_t mdio_lock; | 91 | struct mutex mdio_lock; |
| 92 | 92 | ||
| 93 | struct device *dev; | 93 | struct device *dev; |
| 94 | 94 | ||
| @@ -284,10 +284,11 @@ struct phy_device { | |||
| 284 | 284 | ||
| 285 | /* Interrupt and Polling infrastructure */ | 285 | /* Interrupt and Polling infrastructure */ |
| 286 | struct work_struct phy_queue; | 286 | struct work_struct phy_queue; |
| 287 | struct work_struct state_queue; | ||
| 287 | struct timer_list phy_timer; | 288 | struct timer_list phy_timer; |
| 288 | atomic_t irq_disable; | 289 | atomic_t irq_disable; |
| 289 | 290 | ||
| 290 | spinlock_t lock; | 291 | struct mutex lock; |
| 291 | 292 | ||
| 292 | struct net_device *attached_dev; | 293 | struct net_device *attached_dev; |
| 293 | 294 | ||
