net: stmmac: fix bad merge conflict resolution
authorOlof Johansson <olof@lixom.net>
Fri, 6 Sep 2013 01:01:41 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Sep 2013 01:07:00 +0000 (18:07 -0700)
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>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

index 7a0072003f34e3f5aba03f73718bcb412df3eb43..51c9069ef4052c52caa06333be5927d47bccdf68 100644 (file)
@@ -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;
 }