svn commit: r197707 - user/rpaulo/armpmc/sys

[Rui Paulo]

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