From owner-svn-src-all@FreeBSD.ORG  Mon May 12 22:15:58 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5CC1CBA7;
 Mon, 12 May 2014 22:15:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4945C296E;
 Mon, 12 May 2014 22:15:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CMFw66087045;
 Mon, 12 May 2014 22:15:58 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CMFvU5087043;
 Mon, 12 May 2014 22:15:57 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201405122215.s4CMFvU5087043@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 12 May 2014 22:15:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265936 - in stable/10/sys: arm/ti/am335x modules
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 May 2014 22:15:58 -0000

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).