diff options
author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/fan.c | |
parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
download | op-kernel-dev-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip op-kernel-dev-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.gz |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/fan.c')
-rw-r--r-- | drivers/acpi/fan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index dfc0486..60d54d1 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -265,7 +265,7 @@ static int acpi_fan_add(struct acpi_device *device) dev_info(&device->dev, "registered as cooling_device%d\n", cdev->id); - acpi_driver_data(device) = cdev; + device->driver_data = cdev; result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj, "thermal_cooling"); |