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/misc/intel_menlow.c | |
parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
download | talos-op-linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.gz talos-op-linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/misc/intel_menlow.c')
-rw-r--r-- | drivers/misc/intel_menlow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c index 80a136352408..cd3ea7faa5b6 100644 --- a/drivers/misc/intel_menlow.c +++ b/drivers/misc/intel_menlow.c @@ -175,7 +175,7 @@ static int intel_menlow_memory_add(struct acpi_device *device) goto end; } - acpi_driver_data(device) = cdev; + device->driver_data = cdev; result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj, "thermal_cooling"); if (result) |