diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/bus.c | 1 | ||||
-rw-r--r-- | drivers/acpi/glue.c | 6 | ||||
-rw-r--r-- | drivers/acpi/internal.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index f32cfd64c999..db9eca8d3cf2 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -855,6 +855,7 @@ static int __init acpi_init(void) | |||
855 | acpi_kobj = NULL; | 855 | acpi_kobj = NULL; |
856 | } | 856 | } |
857 | 857 | ||
858 | init_acpi_device_notify(); | ||
858 | result = acpi_bus_init(); | 859 | result = acpi_bus_init(); |
859 | 860 | ||
860 | if (!result) { | 861 | if (!result) { |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 5479b9f42513..8bd2c2a6884d 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
@@ -286,10 +286,8 @@ static int acpi_platform_notify_remove(struct device *dev) | |||
286 | return 0; | 286 | return 0; |
287 | } | 287 | } |
288 | 288 | ||
289 | static int __init init_acpi_device_notify(void) | 289 | int __init init_acpi_device_notify(void) |
290 | { | 290 | { |
291 | if (acpi_disabled) | ||
292 | return 0; | ||
293 | if (platform_notify || platform_notify_remove) { | 291 | if (platform_notify || platform_notify_remove) { |
294 | printk(KERN_ERR PREFIX "Can't use platform_notify\n"); | 292 | printk(KERN_ERR PREFIX "Can't use platform_notify\n"); |
295 | return 0; | 293 | return 0; |
@@ -298,5 +296,3 @@ static int __init init_acpi_device_notify(void) | |||
298 | platform_notify_remove = acpi_platform_notify_remove; | 296 | platform_notify_remove = acpi_platform_notify_remove; |
299 | return 0; | 297 | return 0; |
300 | } | 298 | } |
301 | |||
302 | arch_initcall(init_acpi_device_notify); | ||
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 44b84021d84d..8a45dd8e03b5 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
@@ -1,5 +1,6 @@ | |||
1 | /* For use by Linux/ACPI infrastructure, not drivers */ | 1 | /* For use by Linux/ACPI infrastructure, not drivers */ |
2 | 2 | ||
3 | int init_acpi_device_notify(void); | ||
3 | int acpi_scan_init(void); | 4 | int acpi_scan_init(void); |
4 | int acpi_system_init(void); | 5 | int acpi_system_init(void); |
5 | 6 | ||