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/wmi.c | |
parent | a0017f471054a46379abbc4c96e269deaff5d9d9 (diff) | |
parent | 0794469da3f7b2093575cbdfc1108308dd3641ce (diff) |
Merge branch 'sysfs' into release
Diffstat (limited to 'drivers/acpi/wmi.c')
-rw-r--r-- | drivers/acpi/wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index 47cd7baf9b1..8a8b377712c 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c @@ -660,7 +660,7 @@ static void acpi_wmi_notify(acpi_handle handle, u32 event, void *data) wblock->handler(event, wblock->handler_data); acpi_bus_generate_netlink_event( - device->pnp.device_class, device->dev.bus_id, + device->pnp.device_class, dev_name(&device->dev), event, 0); break; } |