X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fpower.c;h=1bef9429189bbf8d9cac96d415ed4ddb0372e379;hb=db89b4f0dbab837d0f3de2c3e9427a8d5393afa3;hp=4ab21cb1c8c7ebde037b51256de4c326efcfd7f6;hpb=9e113e0014204bfb44a2baa29b2a141ede41b074;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 4ab21cb1c8c..1bef9429189 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -657,7 +657,7 @@ static int acpi_power_add(struct acpi_device *device)
 	strcpy(resource->name, device->pnp.bus_id);
 	strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
 	strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
-	acpi_driver_data(device) = resource;
+	device->driver_data = resource;
 
 	/* Evalute the object to get the system level and resource order. */
 	status = acpi_evaluate_object(device->handle, NULL, NULL, &buffer);
@@ -733,7 +733,7 @@ static int acpi_power_resume(struct acpi_device *device)
 	if (!device || !acpi_driver_data(device))
 		return -EINVAL;
 
-	resource = (struct acpi_power_resource *)acpi_driver_data(device);
+	resource = acpi_driver_data(device);
 
 	result = acpi_power_get_state(resource, &state);
 	if (result)