patch-2.3.37 linux/arch/i386/kernel/apm.c

• Lines: 14
• Date: Thu Jan 6 10:16:48 2000
• Orig file: v2.3.36/linux/arch/i386/kernel/apm.c
• Orig date: Mon Dec 20 18:48:21 1999

diff -u --recursive --new-file v2.3.36/linux/arch/i386/kernel/apm.c linux/arch/i386/kernel/apm.c
@@ -1491,6 +1491,13 @@
 		APM_INIT_ERROR_RETURN;
 	}
 
+#ifdef CONFIG_ACPI
+	if (acpi_active) {
+		printk(KERN_NOTICE "apm: overridden by ACPI.\n");
+		APM_INIT_ERROR_RETURN;
+	}
+#endif
+
 	/*
 	 * Set up a segment that references the real mode segment 0x40
 	 * that extends up to the end of page zero (that we have reserved).