Merge branch 'misc' into test

2008-10-22 23:28:38 -04:00
parent 530bc23bfe e3deda9c87
commit 5f50ef453d
30 changed files with 56 additions and 46 deletions
--- 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");