Merge branch 'linus' into core/softlockup

[pandora-kernel.git] / include / linux / phy.h

diff --git a/include/linux/phy.h b/include/linux/phy.h
index d7e54d9..32cf14a 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;