Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / phy.h

diff --git a/include/linux/phy.h b/include/linux/phy.h
index d7e54d98869f8881666d927caf956074d42b4f97..32cf14a4b034aac659f89286821e553b0955b255 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -315,8 +315,7 @@ struct phy_device {
 
        /* Interrupt and Polling infrastructure */
        struct work_struct phy_queue;
-       struct work_struct state_queue;
-       struct timer_list phy_timer;
+       struct delayed_work state_queue;
        atomic_t irq_disable;
 
        struct mutex lock;