summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_memhotplug.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-16 01:04:27 -0500
committerLen Brown <len.brown@intel.com>2006-12-16 01:04:27 -0500
commitcece901481bafbf14de8cbd3a89ae869ea881055 (patch)
treef9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/acpi_memhotplug.c
parentcfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff)
parent50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff)
downloadlinux-cece901481bafbf14de8cbd3a89ae869ea881055.tar.bz2
Pull style into test branch
Conflicts: drivers/acpi/button.c drivers/acpi/ec.c drivers/acpi/osl.c drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r--drivers/acpi/acpi_memhotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 6bcd9e8e7bcb..150112ae48ed 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -429,7 +429,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
if (!device || !acpi_driver_data(device))
return -EINVAL;
- mem_device = (struct acpi_memory_device *)acpi_driver_data(device);
+ mem_device = acpi_driver_data(device);
kfree(mem_device);
return 0;