diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /include/linux/phy.h | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index d7e54d98869f..32cf14a4b034 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -315,8 +315,7 @@ struct phy_device { | |||
| 315 | 315 | ||
| 316 | /* Interrupt and Polling infrastructure */ | 316 | /* Interrupt and Polling infrastructure */ |
| 317 | struct work_struct phy_queue; | 317 | struct work_struct phy_queue; |
| 318 | struct work_struct state_queue; | 318 | struct delayed_work state_queue; |
| 319 | struct timer_list phy_timer; | ||
| 320 | atomic_t irq_disable; | 319 | atomic_t irq_disable; |
| 321 | 320 | ||
| 322 | struct mutex lock; | 321 | struct mutex lock; |