Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / linux / phy.h

diff --git a/include/linux/phy.h b/include/linux/phy.h
index edd4c88ca7d8d1a68e88922bc8466200e59d6214..f0742b6aaa649ba49b6a9a8543bcd4083bb12b1e 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -25,6 +25,8 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 
+#include <asm/atomic.h>
+
 #define PHY_BASIC_FEATURES     (SUPPORTED_10baseT_Half | \
                                 SUPPORTED_10baseT_Full | \
                                 SUPPORTED_100baseT_Half | \
@@ -55,6 +57,7 @@ typedef enum {
        PHY_INTERFACE_MODE_TBI,
        PHY_INTERFACE_MODE_RMII,
        PHY_INTERFACE_MODE_RGMII,
+       PHY_INTERFACE_MODE_RGMII_ID,
        PHY_INTERFACE_MODE_RTBI
 } phy_interface_t;
 
@@ -280,6 +283,7 @@ struct phy_device {
        /* Interrupt and Polling infrastructure */
        struct work_struct phy_queue;
        struct timer_list phy_timer;
+       atomic_t irq_disable;
 
        spinlock_t lock;