diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 17:22:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 17:22:45 -0400 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/acpi/battery.c | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | e73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff) | |
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index d405fbad406a..85332872da45 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -1036,8 +1036,6 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) | |||
| 1036 | if (event == ACPI_BATTERY_NOTIFY_INFO) | 1036 | if (event == ACPI_BATTERY_NOTIFY_INFO) |
| 1037 | acpi_battery_refresh(battery); | 1037 | acpi_battery_refresh(battery); |
| 1038 | acpi_battery_update(battery); | 1038 | acpi_battery_update(battery); |
| 1039 | acpi_bus_generate_proc_event(device, event, | ||
| 1040 | acpi_battery_present(battery)); | ||
| 1041 | acpi_bus_generate_netlink_event(device->pnp.device_class, | 1039 | acpi_bus_generate_netlink_event(device->pnp.device_class, |
| 1042 | dev_name(&device->dev), event, | 1040 | dev_name(&device->dev), event, |
| 1043 | acpi_battery_present(battery)); | 1041 | acpi_battery_present(battery)); |