summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorKevin Lo <kevlo@cvs.openbsd.org>2010-02-22 16:45:30 +0000
committerKevin Lo <kevlo@cvs.openbsd.org>2010-02-22 16:45:30 +0000
commit2ac40e3379fe76ad07058d7df99d83dea2e12605 (patch)
tree6ced3e59cb07ce903be33c490d473c439b756a55 /sys/arch
parent92697f3c81d27192704e74579411b65ade1c30a9 (diff)
Use the logical or operator, not the bitwise operator in
the preprocessor.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/arm/cpufunc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index d72700ae2f7..3f09ae0c8a9 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.c,v 1.11 2009/05/24 04:56:19 drahn Exp $ */
+/* $OpenBSD: cpufunc.c,v 1.12 2010/02/22 16:45:29 kevlo Exp $ */
/* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */
/*
@@ -1844,7 +1844,7 @@ late_abort_fixup(arg)
defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \
defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
- defined(CPU_ARM10) | defined(CPU_ARM11) || defined(CPU_ARMv7)
+ defined(CPU_ARM10) || defined(CPU_ARM11) || defined(CPU_ARMv7)
#define IGN 0
#define OR 1