svn commit: r276166 - head/sys/arm/include

[Ian Lepore]

Author: ian
Date: Wed Dec 24 03:09:55 2014
New Revision: 276166
URL: https://svnweb.freebsd.org/changeset/base/276166

Log:
  Revert a glitched mismerge that got caught up in the prior commit.
  The PJ4B family is still armv7, not armv6.

Modified:
  head/sys/arm/include/cpuconf.h

Modified: head/sys/arm/include/cpuconf.h
==============================================================================
--- head/sys/arm/include/cpuconf.h	Wed Dec 24 03:02:12 2014	(r276165)
+++ head/sys/arm/include/cpuconf.h	Wed Dec 24 03:09:55 2014	(r276166)
@@ -85,14 +85,14 @@
 #endif
 
 #if !defined(ARM_ARCH_6)
-#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B)
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
 #define ARM_ARCH_6	1
 #else
 #define ARM_ARCH_6	0
 #endif
 #endif
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
 #define ARM_ARCH_7A	1
 #else
 #define ARM_ARCH_7A	0