From 28b53bcff7823542b8b76566c5c5cade9b7db086 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 24 Mar 2009 16:50:19 -0600
Subject: [PATCH] --- yaml --- r: 141883 b: refs/heads/master c:
 201b8c655f7a48563f6a0b66f9e388460a1ea611 h: refs/heads/master i:   141881:
 9b804edb530cece03fdd589db0991079dd7e734c   141879:
 3f3b1e747ac08c9cde279df541f95474bb729f11 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/bus.c      | 1 +
 trunk/drivers/acpi/internal.h | 2 ++
 trunk/drivers/acpi/wakeup.c   | 7 +------
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2ae41b82914a..2c7a23871bbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cee43e07940bee13462e63bd75ce4430b155886
+refs/heads/master: 201b8c655f7a48563f6a0b66f9e388460a1ea611
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index a812e841cb64..7fe0945f7bcf 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/drivers/acpi/bus.c
@@ -886,6 +886,7 @@ static int __init acpi_init(void)
 	acpi_system_init();
 	acpi_debug_init();
 	acpi_sleep_proc_init();
+	acpi_wakeup_device_init();
 	return result;
 }
 
diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
index 8870e5fd8494..11a69b53004e 100644
--- a/trunk/drivers/acpi/internal.h
+++ b/trunk/drivers/acpi/internal.h
@@ -22,6 +22,8 @@ int acpi_power_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
 
+int acpi_wakeup_device_init(void);
+
 /* --------------------------------------------------------------------------
                                   Embedded Controller
    -------------------------------------------------------------------------- */
diff --git a/trunk/drivers/acpi/wakeup.c b/trunk/drivers/acpi/wakeup.c
index 3f29fd53e9a6..5aee8c26cc9f 100644
--- a/trunk/drivers/acpi/wakeup.c
+++ b/trunk/drivers/acpi/wakeup.c
@@ -138,13 +138,10 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 	spin_unlock(&acpi_device_lock);
 }
 
-static int __init acpi_wakeup_device_init(void)
+int __init acpi_wakeup_device_init(void)
 {
 	struct list_head *node, *next;
 
-	if (acpi_disabled)
-		return 0;
-
 	spin_lock(&acpi_device_lock);
 	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
 		struct acpi_device *dev = container_of(node,
@@ -165,5 +162,3 @@ static int __init acpi_wakeup_device_init(void)
 	spin_unlock(&acpi_device_lock);
 	return 0;
 }
-
-late_initcall(acpi_wakeup_device_init);