summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-11-12 05:14:49 +0300
committerLen Brown <len.brown@intel.com>2008-11-12 05:14:49 +0300
commit9b5a56ddfd615a27e3a0856ceae1592a24021e42 (patch)
treef7ae71e5f74d3aac8cad93f44f7022b935ac9057 /drivers/acpi/battery.c
parenta0017f471054a46379abbc4c96e269deaff5d9d9 (diff)
parent0794469da3f7b2093575cbdfc1108308dd3641ce (diff)
downloadlinux-9b5a56ddfd615a27e3a0856ceae1592a24021e42.tar.xz
Merge branch 'sysfs' into release
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r--drivers/acpi/battery.c2
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)
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,
+ dev_name(&device->dev), event,
acpi_battery_present(battery));
#ifdef CONFIG_ACPI_SYSFS_POWER
/* acpi_batter_update could remove power_supply object */