Merge branch 'master' into 85xx

[linux-2.6-omap-h63xx.git] / drivers / net / chelsio / common.h

diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index b265941e137220a90eb3d8d1588c61cb04ee717d..787f2f2820fe461625da7392c8c8b1af49d74314 100644 (file)
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -279,7 +279,7 @@ struct adapter {
        struct petp   *tp;
 
        struct port_info port[MAX_NPORTS];
-       struct work_struct stats_update_task;
+       struct delayed_work stats_update_task;
        struct timer_list stats_update_timer;
 
        spinlock_t tpi_lock;
@@ -324,7 +324,7 @@ struct board_info {
        unsigned char           mdio_phybaseaddr;
        struct gmac            *gmac;
        struct gphy            *gphy;
-       struct mdio_ops        *mdio_ops;
+       struct mdio_ops        *mdio_ops;
        const char             *desc;
 };