diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 23:22:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 23:22:45 +0200 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/acpi/battery.c | |
| parent | Linux 3.11-rc5 (diff) | |
| parent | ACPI / osl: Fix osi_setup_entries[] __initdata attribute location (diff) | |
| download | linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.xz linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.zip | |
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) if (event == ACPI_BATTERY_NOTIFY_INFO) acpi_battery_refresh(battery); acpi_battery_update(battery); - acpi_bus_generate_proc_event(device, event, - acpi_battery_present(battery)); acpi_bus_generate_netlink_event(device->pnp.device_class, dev_name(&device->dev), event, acpi_battery_present(battery)); |