Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[firefly-linux-kernel-4.4.55.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index c1b3ed3fb78715fbe868ab531d07e20b00fc05cd..9e495d31516ee4ed90f8cb487116f76c251465aa 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -80,6 +80,10 @@ struct stmmac_mdio_bus_data {
        unsigned int phy_mask;
        int *irqs;
        int probed_phy_irq;
+#ifdef CONFIG_OF
+       int reset_gpio, active_low;
+       u32 delays[3];
+#endif
 };
 
 struct stmmac_dma_cfg {