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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/skfp/hwt.c b/drivers/net/skfp/hwt.c
index 053151468f93..c0798fd2ca69 100644
--- a/drivers/net/skfp/hwt.c
+++ b/drivers/net/skfp/hwt.c
@@ -179,7 +179,7 @@ u_long hwt_read(struct s_smc *smc)
                 else
                         smc->hw.t_stop = smc->hw.t_start - tr ;
         }
-        return (smc->hw.t_stop) ;
+        return smc->hw.t_stop;
 }
 
 #ifdef  PCI
@@ -208,7 +208,7 @@ u_long hwt_quick_read(struct s_smc *smc)
         outpw(ADDR(B2_TI_CRTL), TIM_START) ;
         outpd(ADDR(B2_TI_INI),interval) ;
 
-        return(time) ;
+        return time;
 }
 
 /************************
@@ -221,7 +221,7 @@ u_long hwt_quick_read(struct s_smc *smc)
  * para start           start time
  *      duration        time to wait
  *
- * NOTE: The fuction will return immediately, if the timer is not 
+ * NOTE: The function will return immediately, if the timer is not
  *       started
  ************************/
 void hwt_wait_time(struct s_smc *smc, u_long start, long int duration)