[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_emac / ibm_emac_core.h

diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h
index e9b44d030ac339ee0a3c4682ae0ed45ba077250d..911abbaf471b509187b0b187905a18216ba05b0c 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_core.h
+++ b/drivers/net/ibm_emac/ibm_emac_core.h
@@ -189,6 +189,8 @@ struct ocp_enet_private {
        struct timer_list               link_timer;
        int                             reset_failed;
 
+       int                             stop_timeout;   /* in us */
+
        struct ibm_emac_error_stats     estats;
        struct net_device_stats         nstats;