From: Chen-Yu Tsai Date: Fri, 17 Jan 2014 13:24:43 +0000 (+0800) Subject: blackfin: Update stmmac callback signatures X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f370c574f0359c0e27fe2b8a562587802142ccb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git blackfin: Update stmmac callback signatures stmmac callbacks have been extended for better separation. Update them to avoid breakage. Signed-off-by: Chen-Yu Tsai Signed-off-by: David S. Miller --- diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index 82beedd953f6..05194e95981b 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c @@ -117,7 +117,7 @@ static struct stmmac_dma_cfg eth_dma_cfg = { .pbl = 2, }; -int stmmac_ptp_clk_init(struct platform_device *pdev) +int stmmac_ptp_clk_init(struct platform_device *pdev, void *priv) { bfin_write32(PADS0_EMAC_PTP_CLKSEL, 0); return 0;