Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index d66c61774d954ba3866bcad34d280fc5676853be..e103529156986bf3814ca35b156dc10917bd34ae 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -40,9 +40,9 @@ struct plat_stmmacenet_data {
        int pmt;
        void (*fix_mac_speed)(void *priv, unsigned int speed);
        void (*bus_setup)(void __iomem *ioaddr);
-#ifdef CONFIG_STM_DRIVERS
-       struct stm_pad_config *pad_config;
-#endif
+       int (*init)(struct platform_device *pdev);
+       void (*exit)(struct platform_device *pdev);
+       void *custom_cfg;
        void *bsp_priv;
 };