summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2016-03-18 13:35:25 +0000
committerjsg <jsg@openbsd.org>2016-03-18 13:35:25 +0000
commit0d13497d34c923474e168e635acfdcf28091bf69 (patch)
treecaf41b587b1af7b29d74d80e879eab5d7e238190 /sys
parentMake the SCRIPT_NAME logic simpler, safer, and make it actually work; (diff)
downloadwireguard-openbsd-0d13497d34c923474e168e635acfdcf28091bf69.tar.xz
wireguard-openbsd-0d13497d34c923474e168e635acfdcf28091bf69.zip
IXP425 is v5 not v4. Same change by msaitoh in NetBSD rev 1.16.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm/include/cpuconf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/arm/include/cpuconf.h b/sys/arch/arm/include/cpuconf.h
index 0993a415169..caa0b469b7a 100644
--- a/sys/arch/arm/include/cpuconf.h
+++ b/sys/arch/arm/include/cpuconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuconf.h,v 1.9 2016/03/18 13:16:02 jsg Exp $ */
+/* $OpenBSD: cpuconf.h,v 1.10 2016/03/18 13:35:25 jsg Exp $ */
/* $NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $ */
/*
@@ -49,7 +49,7 @@
* Determine which ARM architecture versions are configured.
*/
#if (defined(CPU_SA1100) || defined(CPU_SA1110) || \
- defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
+ defined(CPU_IXP12X0))
#define ARM_ARCH_4 1
#else
#define ARM_ARCH_4 0
@@ -57,7 +57,7 @@
#if (defined(CPU_ARM9E) || defined(CPU_ARM10) || \
defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
- defined(CPU_XSCALE_PXA2X0))
+ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425))
#define ARM_ARCH_5 1
#else
#define ARM_ARCH_5 0