From 4a5014e48bea2d43d2f83b27256fcf2d01592953 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 10 Oct 1994 01:14:03 +0000
Subject: [PATCH] Got rid of "APM" macro.  Now only NAPM is needed to activate
 the APM stuff.

---
 sys/i386/apm/apm_setup.s  | 5 +----
 sys/i386/bios/apm_setup.s | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s
index 1f2856cb33a..d354679a98d 100644
--- a/sys/i386/apm/apm_setup.s
+++ b/sys/i386/apm/apm_setup.s
@@ -12,11 +12,9 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_setup.s,v 1.2 1994/10/01 05:12:24 davidg Exp $
+ *	$Id: apm_setup.s,v 1.3 1994/10/02 01:45:42 phk Exp $
  */
 
-#ifdef APM
-
 #define ASM
 
 #include <machine/asmacros.h>
@@ -69,4 +67,3 @@ _apm_flags:
 	.globl	_apm_flags
 	.word	0
 
-#endif	/* APM */
diff --git a/sys/i386/bios/apm_setup.s b/sys/i386/bios/apm_setup.s
index 1f2856cb33a..d354679a98d 100644
--- a/sys/i386/bios/apm_setup.s
+++ b/sys/i386/bios/apm_setup.s
@@ -12,11 +12,9 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_setup.s,v 1.2 1994/10/01 05:12:24 davidg Exp $
+ *	$Id: apm_setup.s,v 1.3 1994/10/02 01:45:42 phk Exp $
  */
 
-#ifdef APM
-
 #define ASM
 
 #include <machine/asmacros.h>
@@ -69,4 +67,3 @@ _apm_flags:
 	.globl	_apm_flags
 	.word	0
 
-#endif	/* APM */