From e80a59970c787e3ce6b132d942f08ff12c256ad9 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 26 Apr 1997 19:47:59 +0000
Subject: [PATCH] fix & instead of && in #if statement reorder #includes to
 alphabetical order

Noted by: bde
---
 sys/i386/i386/microtime.s | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index 6123e41fb659..ab1475d74200 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -32,16 +32,16 @@
  * SUCH DAMAGE.
  *
  *	from: Steve McCanne's microtime code
- *	$Id: microtime.s,v 1.20 1997/02/22 09:32:34 peter Exp $
+ *	$Id: microtime.s,v 1.21 1997/04/26 11:45:13 peter Exp $
  */
 
-#include "opt_smp.h"
 #include "opt_cpu.h"
+#include "opt_smp.h"
 
-#include <machine/asmacros.h>
 #ifdef APIC_IO
 #include <machine/apic.h>
 #endif /* APIC_IO */
+#include <machine/asmacros.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
@@ -49,7 +49,7 @@
 
 ENTRY(microtime)
 
-#if (defined(I586_CPU) || defined(I686_CPU)) & !defined(SMP)
+#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP)
 	movl	_i586_ctr_freq, %ecx
 	testl	%ecx, %ecx
 	jne	pentium_microtime