diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /drivers/acpi/glue.c | |
parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r-- | drivers/acpi/glue.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 5479b9f4251..8bd2c2a6884 100644 --- a/drivers/acpi/glue.c +++ b/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); |