Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / net / ethernet / freescale / fs_enet / fs_enet.h

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index 5ce516c8a62a135e9819a435d49a2f2ed26242a8..92e06b37a199bb9aa7bdb8a23c298296aa5bd217 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_ENET_H
 #define FS_ENET_H
 
@@ -137,7 +138,6 @@ struct fs_enet_private {
        cbd_t __iomem *cur_rx;
        cbd_t __iomem *cur_tx;
        int tx_free;
-       struct timer_list phy_timer_list;
        const struct phy_info *phy;
        u32 msg_enable;
        struct mii_if_info mii_if;