From c9a497686e18be5d645c97323e34c2029492a2c6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Apr 2009 12:45:20 -0700
Subject: [PATCH] --- yaml --- r: 143001 b: refs/heads/master c:
 b0cbc861a3c05e634520b049b5cc27ad6febb51f h: refs/heads/master i:   142999:
 26074a25066dc88e1c03cd1943ddee4af57e609b v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/battery.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0749027ff0cf..44965f5a89cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6de2c80e9d758d2e36c21699117db6178c0f517
+refs/heads/master: b0cbc861a3c05e634520b049b5cc27ad6febb51f
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 3c7d8942f23b..b0de6312919a 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/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;