Skip to content

Commit

Permalink
net: stmmac: fix bad merge conflict resolution
Browse files Browse the repository at this point in the history
Merge commit 06c5405 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: Olof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Olof Johansson authored and Linus Torvalds committed Sep 6, 2013
1 parent fc8cc67 commit 356f9e7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 356f9e7

Please sign in to comment.