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

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

diff --git a/[refs] b/[refs]
index dc1b0365c033..51b983064637 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f810c33f695e020776ce66c903e0b41872f1b2
+refs/heads/master: 0e46517d9660ee6ae0a0c5d8a4e50451bc84d61d
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index f32cfd64c999..db9eca8d3cf2 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/drivers/acpi/bus.c
@@ -855,6 +855,7 @@ static int __init acpi_init(void)
 		acpi_kobj = NULL;
 	}
 
+	init_acpi_device_notify();
 	result = acpi_bus_init();
 
 	if (!result) {
diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c
index 5479b9f42513..8bd2c2a6884d 100644
--- a/trunk/drivers/acpi/glue.c
+++ b/trunk/drivers/acpi/glue.c
@@ -286,10 +286,8 @@ static int acpi_platform_notify_remove(struct device *dev)
 	return 0;
 }
 
-static int __init init_acpi_device_notify(void)
+int __init init_acpi_device_notify(void)
 {
-	if (acpi_disabled)
-		return 0;
 	if (platform_notify || platform_notify_remove) {
 		printk(KERN_ERR PREFIX "Can't use platform_notify\n");
 		return 0;
@@ -298,5 +296,3 @@ static int __init init_acpi_device_notify(void)
 	platform_notify_remove = acpi_platform_notify_remove;
 	return 0;
 }
-
-arch_initcall(init_acpi_device_notify);
diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
index 44b84021d84d..8a45dd8e03b5 100644
--- a/trunk/drivers/acpi/internal.h
+++ b/trunk/drivers/acpi/internal.h
@@ -1,5 +1,6 @@
 /* For use by Linux/ACPI infrastructure, not drivers */
 
+int init_acpi_device_notify(void);
 int acpi_scan_init(void);
 int acpi_system_init(void);