Merge branch 'for-2637/i2c/samsung' into next-i2c

[net-next-2.6.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 632ff7c0328040f4f3ceb5dd8f06655bf05e84b5..d66c61774d954ba3866bcad34d280fc5676853be 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -32,10 +32,14 @@
 struct plat_stmmacenet_data {
        int bus_id;
        int pbl;
+       int clk_csr;
        int has_gmac;
        int enh_desc;
+       int tx_coe;
+       int bugged_jumbo;
+       int pmt;
        void (*fix_mac_speed)(void *priv, unsigned int speed);
-       void (*bus_setup)(unsigned long ioaddr);
+       void (*bus_setup)(void __iomem *ioaddr);
 #ifdef CONFIG_STM_DRIVERS
        struct stm_pad_config *pad_config;
 #endif