From cb7a5b3c3f14f78ed7b5cbd9a01a1070c2187c86 Mon Sep 17 00:00:00 2001
From: Oleg Safiullin <form@cvs.openbsd.org>
Date: Mon, 29 Dec 2008 08:29:36 +0000
Subject: fix compiling w/o apm(4) ok deraadt

---
 sys/arch/i386/i386/mpbios.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c
index 003feeccf40..b328e9c9863 100644
--- a/sys/arch/i386/i386/mpbios.c
+++ b/sys/arch/i386/i386/mpbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbios.c,v 1.28 2008/12/26 17:09:52 deraadt Exp $	*/
+/*	$OpenBSD: mpbios.c,v 1.29 2008/12/29 08:29:35 form Exp $	*/
 /*	$NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $	*/
 
 /*-
@@ -268,6 +268,7 @@ mpbios_probe(struct device *self)
 
 	struct		mp_map t;
 
+#if NAPM > 0 && NACPI > 0
 	/*
 	 * If we have acpi but chose to use apm, then we really should
 	 * not go use mpbios.  Systems with usable acpi typically have
@@ -275,6 +276,7 @@ mpbios_probe(struct device *self)
 	 */
 	if (haveacpibutusingapm)
 		return (0);
+#endif
 
 	/*
 	 * Skip probe if someone else (e.g. acpi) already provided the
-- 
cgit v1.2.3