diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/acpi_memhotplug.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
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.c | 2 |
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) | |||
| 429 | if (!device || !acpi_driver_data(device)) | 429 | if (!device || !acpi_driver_data(device)) |
| 430 | return -EINVAL; | 430 | return -EINVAL; |
| 431 | 431 | ||
| 432 | mem_device = (struct acpi_memory_device *)acpi_driver_data(device); | 432 | mem_device = acpi_driver_data(device); |
| 433 | kfree(mem_device); | 433 | kfree(mem_device); |
| 434 | 434 | ||
| 435 | return 0; | 435 | return 0; |