From 493c987f7a352ca64fdb4dc03a21e24cbaf46f55 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 9 Jul 2000 02:54:55 +0000
Subject: Merge with Linux 2.4.0-pre3-test6.

---
 arch/i386/kernel/apm.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/i386/kernel/apm.c')

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index c78a8f512..6a4eedf72 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -660,6 +660,7 @@ static void apm_power_off(void)
 #endif
 }
 
+#ifdef CONFIG_APM_DO_ENABLE
 static int apm_enable_power_management(int enable)
 {
 	u32	eax;
@@ -675,6 +676,7 @@ static int apm_enable_power_management(int enable)
 		apm_bios_info.flags |= APM_BIOS_DISABLED;
 	return APM_SUCCESS;
 }
+#endif
 
 static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
 {
-- 
cgit v1.2.3