diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-11 12:45:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-11 12:45:20 -0700 |
| commit | b0cbc861a3c05e634520b049b5cc27ad6febb51f (patch) | |
| tree | 1e9117edcc976d240514e38092aa2a3e4b4a1a20 /drivers/acpi | |
| parent | d6de2c80e9d758d2e36c21699117db6178c0f517 (diff) | |
| download | linux-b0cbc861a3c05e634520b049b5cc27ad6febb51f.tar.gz linux-b0cbc861a3c05e634520b049b5cc27ad6febb51f.tar.bz2 linux-b0cbc861a3c05e634520b049b5cc27ad6febb51f.zip | |
Revert "ACPI battery: fix async boot oops"
This reverts commit 5d38258ec026921a7b266f4047ebeaa75db358e5, since the
underlying problem got fixed properly in the previous commit ("async:
Fix module loading async-work regression").
Cc: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 3c7d8942f23b..b0de6312919a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -903,7 +903,7 @@ static struct acpi_driver acpi_battery_driver = { }, }; -static void acpi_battery_init_async(void *unused, async_cookie_t cookie) +static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) { if (acpi_disabled) return; |