diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-12 03:14:49 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-12 03:14:49 +0100 |
| commit | 9b5a56ddfd615a27e3a0856ceae1592a24021e42 (patch) | |
| tree | f7ae71e5f74d3aac8cad93f44f7022b935ac9057 /drivers/acpi/ac.c | |
| parent | Merge branch 'sony' into release (diff) | |
| parent | ACPI: struct device - replace bus_id with dev_name(), dev_set_name() (diff) | |
| download | linux-9b5a56ddfd615a27e3a0856ceae1592a24021e42.tar.xz linux-9b5a56ddfd615a27e3a0856ceae1592a24021e42.zip | |
Merge branch 'sysfs' into release
Diffstat (limited to 'drivers/acpi/ac.c')
| -rw-r--r-- | drivers/acpi/ac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 5cdd713a0eaf..9b917dac7732 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -241,7 +241,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) acpi_ac_get_state(ac); acpi_bus_generate_proc_event(device, event, (u32) ac->state); acpi_bus_generate_netlink_event(device->pnp.device_class, - device->dev.bus_id, event, + dev_name(&device->dev), event, (u32) ac->state); #ifdef CONFIG_ACPI_SYSFS_POWER kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); |