Index: linux-2.6.15-rc1/arch/arm/kernel/apm.c
===================================================================
--- linux-2.6.15-rc1.orig/arch/arm/kernel/apm.c	2005-11-14 11:14:22.000000000 +0000
+++ linux-2.6.15-rc1/arch/arm/kernel/apm.c	2005-11-14 12:26:35.000000000 +0000
@@ -20,7 +20,6 @@
 #include <linux/apm_bios.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -476,11 +475,7 @@
 	do {
 		apm_event_t event;
 
-		wait_event_interruptible(kapmd_wait,
-				!queue_empty(&kapmd_queue) || !pm_active);
-
-		if (!pm_active)
-			break;
+		wait_event_interruptible(kapmd_wait, !queue_empty(&kapmd_queue));
 
 		spin_lock_irq(&kapmd_queue_lock);
 		event = 0;
@@ -522,18 +517,9 @@
 		return -ENODEV;
 	}
 
-	if (PM_IS_ACTIVE()) {
-		printk(KERN_NOTICE "apm: overridden by ACPI.\n");
-		return -EINVAL;
-	}
-
-	pm_active = 1;
-
 	ret = kernel_thread(kapmd, NULL, CLONE_KERNEL);
-	if (ret < 0) {
-		pm_active = 0;
+	if (ret < 0)
 		return ret;
-	}
 
 #ifdef CONFIG_PROC_FS
 	create_proc_info_entry("apm", 0, NULL, apm_get_info);
@@ -543,7 +529,6 @@
 	if (ret != 0) {
 		remove_proc_entry("apm", NULL);
 
-		pm_active = 0;
 		wake_up(&kapmd_wait);
 		wait_for_completion(&kapmd_exit);
 	}
@@ -556,7 +541,6 @@
 	misc_deregister(&apm_device);
 	remove_proc_entry("apm", NULL);
 
-	pm_active = 0;
 	wake_up(&kapmd_wait);
 	wait_for_completion(&kapmd_exit);
 }
Index: linux-2.6.15-rc1/arch/arm/Kconfig
===================================================================
--- linux-2.6.15-rc1.orig/arch/arm/Kconfig	2005-11-14 11:14:22.000000000 +0000
+++ linux-2.6.15-rc1/arch/arm/Kconfig	2005-11-14 12:27:47.000000000 +0000
@@ -670,7 +670,7 @@
 
 config APM
 	tristate "Advanced Power Management Emulation"
-	depends on PM
+	depends on PM && !ACPI
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with
@@ -694,6 +694,13 @@
 	  anything, try disabling/enabling this option (or disabling/enabling
 	  APM in your BIOS).
 
+config PM_LEGACY
+	bool "Legacy Power Management API"
+	depends on PM
+	default n
+	---help---
+	  Support for pm_register() and friends.
+
 endmenu
 
 source "net/Kconfig"