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/acpi/acpi_memhotplug.c | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
Merge branch 'misc' into test
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 bbad9b6c2c88..289d02260f16 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -403,7 +403,7 @@ static int acpi_memory_device_add(struct acpi_device *device) | |||
| 403 | mem_device->device = device; | 403 | mem_device->device = device; |
| 404 | sprintf(acpi_device_name(device), "%s", ACPI_MEMORY_DEVICE_NAME); | 404 | sprintf(acpi_device_name(device), "%s", ACPI_MEMORY_DEVICE_NAME); |
| 405 | sprintf(acpi_device_class(device), "%s", ACPI_MEMORY_DEVICE_CLASS); | 405 | sprintf(acpi_device_class(device), "%s", ACPI_MEMORY_DEVICE_CLASS); |
| 406 | acpi_driver_data(device) = mem_device; | 406 | device->driver_data = mem_device; |
| 407 | 407 | ||
| 408 | /* Get the range from the _CRS */ | 408 | /* Get the range from the _CRS */ |
| 409 | result = acpi_memory_get_device_resources(mem_device); | 409 | result = acpi_memory_get_device_resources(mem_device); |