diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:49 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:49 -0500 |
| commit | 9b5a56ddfd615a27e3a0856ceae1592a24021e42 (patch) | |
| tree | f7ae71e5f74d3aac8cad93f44f7022b935ac9057 /drivers/acpi/battery.c | |
| parent | a0017f471054a46379abbc4c96e269deaff5d9d9 (diff) | |
| parent | 0794469da3f7b2093575cbdfc1108308dd3641ce (diff) | |
Merge branch 'sysfs' into release
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 47f6e38fa6c8..1423b0c0cd2e 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -781,7 +781,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) | |||
| 781 | acpi_bus_generate_proc_event(device, event, | 781 | acpi_bus_generate_proc_event(device, event, |
| 782 | acpi_battery_present(battery)); | 782 | acpi_battery_present(battery)); |
| 783 | acpi_bus_generate_netlink_event(device->pnp.device_class, | 783 | acpi_bus_generate_netlink_event(device->pnp.device_class, |
| 784 | device->dev.bus_id, event, | 784 | dev_name(&device->dev), event, |
| 785 | acpi_battery_present(battery)); | 785 | acpi_battery_present(battery)); |
| 786 | #ifdef CONFIG_ACPI_SYSFS_POWER | 786 | #ifdef CONFIG_ACPI_SYSFS_POWER |
| 787 | /* acpi_batter_update could remove power_supply object */ | 787 | /* acpi_batter_update could remove power_supply object */ |