From owner-svn-src-user@FreeBSD.ORG  Fri Oct  2 11:17:51 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2655106566B;
	Fri,  2 Oct 2009 11:17:51 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92A9D8FC0A;
	Fri,  2 Oct 2009 11:17:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n92BHpgK099478;
	Fri, 2 Oct 2009 11:17:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n92BHpUR099476;
	Fri, 2 Oct 2009 11:17:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200910021117.n92BHpUR099476@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 2 Oct 2009 11:17:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197707 - user/rpaulo/armpmc/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Oct 2009 11:17:51 -0000

Author: rpaulo
Date: Fri Oct  2 11:17:51 2009
New Revision: 197707
URL: http://svn.freebsd.org/changeset/base/197707

Log:
  merge from head

Modified:
  user/rpaulo/armpmc/sys/pmc.h

Modified: user/rpaulo/armpmc/sys/pmc.h
==============================================================================
--- user/rpaulo/armpmc/sys/pmc.h	Fri Oct  2 11:14:12 2009	(r197706)
+++ user/rpaulo/armpmc/sys/pmc.h	Fri Oct  2 11:17:51 2009	(r197707)
@@ -85,7 +85,7 @@
 	__PMC_CPU(INTEL_CORE2EXTREME,	0x89,	"Intel Core2 Extreme")	\
 	__PMC_CPU(INTEL_ATOM,	0x8A,	"Intel Atom") \
 	__PMC_CPU(INTEL_COREI7, 0x8B,   "Intel Core i7")	\
-	__PMC_CPU(INTEL_XSCALE,	0x8C,	"Intel XScale")
+	__PMC_CPU(INTEL_XSCALE,	0x100,	"Intel XScale")
 
 enum pmc_cputype {
 #undef	__PMC_CPU