svn commit: r265936 - in stable/10/sys: arm/ti/am335x modules

[Ian Lepore]

Author: ian
Date: Mon May 12 22:15:57 2014
New Revision: 265936
URL: http://svnweb.freebsd.org/changeset/base/265936

Log:
  MFC r259099: Fix a small error in calculating length of DELAY().

Modified:
  stable/10/sys/arm/ti/am335x/am335x_dmtimer.c
  stable/10/sys/modules/Makefile

Modified: stable/10/sys/arm/ti/am335x/am335x_dmtimer.c
==============================================================================
--- stable/10/sys/arm/ti/am335x/am335x_dmtimer.c	Mon May 12 21:40:03 2014	(r265935)
+++ stable/10/sys/arm/ti/am335x/am335x_dmtimer.c	Mon May 12 22:15:57 2014	(r265936)
@@ -359,7 +359,7 @@ DELAY(int usec)
 	}
 
 	/* Get the number of times to count */
-	counts = usec * ((am335x_dmtimer_tc.tc_frequency / 1000000) + 1);
+	counts = usec * (am335x_dmtimer_tc.tc_frequency / 1000000) + 1;
 
 	first = am335x_dmtimer_tc_read_4(DMTIMER_TCRR);
 

Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile	Mon May 12 21:40:03 2014	(r265935)
+++ stable/10/sys/modules/Makefile	Mon May 12 22:15:57 2014	(r265936)
@@ -2,6 +2,8 @@
 
 .include <bsd.own.mk>
 
+SUBDIR_PARALLEL=
+
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).