Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 356f9e74 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

net: stmmac: fix bad merge conflict resolution 



Merge commit 06c54055 did a bad conflict resolution accidentally
leaving out a closing brace.  Add it back.

This breaks a handful of defconfigs on ARM, so it'd be good to see it
applied pretty quickly.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc8cc677

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, 
	if (plat->force_thresh_dma_mode) {

		plat->force_sf_dma_mode = 0;

		pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");

	}



	return 0;

}