Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6-omap-h63xx.git] / drivers / net / arm / at91_ether.h

diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
index 9885735c9c8aee7cea8bd674b9348ad7cd2b0a09..b6b665de2ea0c28ac56e4ba30a23044fe0b29b36 100644 (file)
--- a/drivers/net/arm/at91_ether.h
+++ b/drivers/net/arm/at91_ether.h
@@ -80,12 +80,14 @@ struct at91_private
        struct net_device_stats stats;
        struct mii_if_info mii;                 /* ethtool support */
        struct at91_eth_data board_data;        /* board-specific configuration */
+       struct clk *ether_clk;                  /* clock */
 
        /* PHY */
        unsigned long phy_type;                 /* type of PHY (PHY_ID) */
        spinlock_t lock;                        /* lock for MDI interface */
        short phy_media;                        /* media interface type */
        unsigned short phy_address;             /* 5-bit MDI address of PHY (0..31) */
+       struct timer_list check_timer;          /* Poll link status */
 
        /* Transmit */
        struct sk_buff *skb;                    /* holds skb until xmit interrupt completes */