git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
battery.c
diff --git
a/drivers/acpi/battery.c
b/drivers/acpi/battery.c
index 3c7d8942f23b4dd126d1a8e2145adfa0a1ad499b..b0de6312919a82a455f20f8d06dddd8f1b672d80 100644
(file)
--- 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;