From: wens@csie.org (Chen-Yu Tsai)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH net-next v3 4/8] blackfin: Update stmmac callback signatures
Date: Fri, 17 Jan 2014 21:24:43 +0800 [thread overview]
Message-ID: <1389965087-21971-5-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1389965087-21971-1-git-send-email-wens@csie.org>
stmmac callbacks have been extended for better separation.
Update them to avoid breakage.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
arch/blackfin/mach-bf609/boards/ezkit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 82beedd..05194e9 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;
--
1.8.5.2
next prev parent reply other threads:[~2014-01-17 13:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 13:24 [PATCH net-next v3 0/8] net: stmmac: Add Allwinner A20 GMAC ethernet Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 1/8] net: stmmac: Enable stmmac main clock when probing hardware Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 2/8] net: stmmac: Add support for optional reset control Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 3/8] net: stmmac: Allocate and pass soc/board specific data to callbacks Chen-Yu Tsai
2014-01-17 13:24 ` Chen-Yu Tsai [this message]
2014-01-17 13:24 ` [PATCH net-next v3 5/8] net: stmmac: Honor DT parameter to force DMA store and forward mode Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 6/8] net: stmmac: Deprecate snps, phy-addr and auto-detect PHY address Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 7/8] net: stmmac: Use driver data and callbacks tied with compatible strings Chen-Yu Tsai
2014-01-17 13:24 ` [PATCH net-next v3 8/8] net: stmmac: sunxi platform extensions for GMAC in Allwinner A20 SoC's Chen-Yu Tsai
2014-01-20 4:03 ` [PATCH net-next v3 0/8] net: stmmac: Add Allwinner A20 GMAC ethernet David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389965087-21971-5-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox