diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/phy.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
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; |