net: stmmac: fix bad merge conflict resolution

[pandora-kernel.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_platform.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 7a00720..51c9069 100644 (file)
--- 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;
 }