diff options
| author | Olof Johansson <olof@lixom.net> | 2013-09-06 05:01:41 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 05:07:00 +0400 |
| commit | 356f9e74ffaafd11741589a9aa21d6c9d2721417 (patch) | |
| tree | 46c0479e0a19b1be15e872a5d25182e3f160e274 /drivers/net/ethernet | |
| parent | fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a (diff) | |
| download | linux-356f9e74ffaafd11741589a9aa21d6c9d2721417.tar.xz | |
net: stmmac: fix bad merge conflict resolution
Merge commit 06c54055bebf 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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 7a0072003f34..51c9069ef405 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -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; } |