diff --git a/[refs] b/[refs] index 195fa3d6e8d3..e28cf9472bff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43c880dff302b30a17044a2d5e4d2f343bf493dc +refs/heads/master: 65cff8720164611ec617d4cc1ea65f2deb3832b6 diff --git a/trunk/drivers/net/ethernet/atheros/atlx/atl1.h b/trunk/drivers/net/ethernet/atheros/atlx/atl1.h index b1fb209b9dd9..3bf79a56220d 100644 --- a/trunk/drivers/net/ethernet/atheros/atlx/atl1.h +++ b/trunk/drivers/net/ethernet/atheros/atlx/atl1.h @@ -763,7 +763,6 @@ struct atl1_adapter { u16 link_duplex; spinlock_t lock; struct napi_struct napi; - struct work_struct tx_timeout_task; struct work_struct reset_dev_task; struct work_struct link_chg_task;