Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 3921cb9dfadb9b4a9bbe30854ccada75725b8005..108739ff9223ba0ea5b29fe789ca877928c63e63 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -177,6 +177,7 @@ struct plat_stmmacenet_data {
        void (*fix_mac_speed)(void *priv, unsigned int speed);
        int (*init)(struct platform_device *pdev, void *priv);
        void (*exit)(struct platform_device *pdev, void *priv);
+       struct mac_device_info *(*setup)(void *priv);
        void *bsp_priv;
        struct clk *stmmac_clk;
        struct clk *pclk;
@@ -185,6 +186,7 @@ struct plat_stmmacenet_data {
        struct reset_control *stmmac_rst;
        struct stmmac_axi *axi;
        int has_gmac4;
+       bool has_sun8i;
        bool tso_en;
        int mac_port_sel_speed;
        bool en_tx_lpi_clockgating;