projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[deliverable/linux.git]
/
drivers
/
acpi
/
battery.c
diff --git
a/drivers/acpi/battery.c
b/drivers/acpi/battery.c
index 68bc227e7c4cc45b80e74e7f354826e6788ec6ad..ac1a599f5147640cc58135391260f0f202a411b1 100644
(file)
--- a/
drivers/acpi/battery.c
+++ b/
drivers/acpi/battery.c
@@
-998,7
+998,6
@@
static int acpi_battery_resume(struct acpi_device *device)
if (!device)
return -EINVAL;
battery = acpi_driver_data(device);
- acpi_battery_refresh(battery);
battery->update_time = 0;
acpi_battery_update(battery);
return 0;
This page took
0.026194 seconds
and
5
git commands to generate.