Skip to content
Commit 12a8fe56 authored by Antonio Borneo's avatar Antonio Borneo Committed by Jakub Kicinski
Browse files

net: stmmac: fix incorrect merge of patch upstream



Commit 75792624 ("net: stmmac: add flexible PPS to dwmac
4.10a") was intended to modify the struct dwmac410_ops, but it got
somehow badly merged and modified the struct dwmac4_ops.

Revert the modification in struct dwmac4_ops and re-apply it
properly in struct dwmac410_ops.

Fixes: 75792624 ("net: stmmac: add flexible PPS to dwmac 4.10a")
Signed-off-by: default avatarAntonio Borneo <antonio.borneo@st.com>
Reported-by: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/20201124223729.886992-1-antonio.borneo@st.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e255e11e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment