diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-25 01:44:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-25 01:44:01 -0400 |
| commit | 25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9 (patch) | |
| tree | c42d40004e9668d83ab03ab7332515ef08683c54 /drivers/acpi/battery.c | |
| parent | a4fd4946214fae86610b989c47e5ae762cc96ddb (diff) | |
| parent | 3e069ee0c30d6f28b79e409ef2df1ffa427897ae (diff) | |
| download | kernel-crypto-25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9.tar.gz kernel-crypto-25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9.tar.xz kernel-crypto-25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9.zip | |
Pull events into release branch
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 81651032791..9b2c0f74f86 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -872,8 +872,11 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) case ACPI_NOTIFY_DEVICE_CHECK: device = battery->device; acpi_battery_notify_update(battery); - acpi_bus_generate_event(device, event, + acpi_bus_generate_proc_event(device, event, acpi_battery_present(battery)); + acpi_bus_generate_netlink_event(device->pnp.device_class, + device->dev.bus_id, event, + acpi_battery_present(battery)); break; default: ACPI_DEBUG_PRINT((ACPI_DB_INFO, |