Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 9f64c8637208..33655814448e 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1069,7 +1069,8 @@ static void scc_tx_done(struct scc_channel *scc)
                 case KISS_DUPLEX_LINK:
                         scc->stat.tx_state = TXS_IDLE2;
                         if (scc->kiss.idletime != TIMER_OFF)
-                        scc_start_tx_timer(scc, t_idle, scc->kiss.idletime*100);
+                                scc_start_tx_timer(scc, t_idle,
+                                                   scc->kiss.idletime*100);
                         break;
                 case KISS_DUPLEX_OPTIMA:
                         scc_notify(scc, HWEV_ALL_SENT);