diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 20:59:51 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 20:59:51 +0100 |
| commit | fe0a20a3eff282efae9f891fd10081a9e2b45c96 (patch) | |
| tree | 48b5d81c132f9ada373464bdc0a04e1d23cfa532 /drivers/base | |
| parent | driver core: property: Update fwnode_property_read_string_array() (diff) | |
| parent | ACPI: Introduce has_acpi_companion() (diff) | |
| download | linux-dev-fe0a20a3eff282efae9f891fd10081a9e2b45c96.tar.xz linux-dev-fe0a20a3eff282efae9f891fd10081a9e2b45c96.zip | |
Merge branch 'acpi-driver-core' into device-properties
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 9421fed40905..17f0204fabef 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -454,7 +454,7 @@ struct platform_device *platform_device_register_full( goto err_alloc; pdev->dev.parent = pdevinfo->parent; - ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion); + pdev->dev.fwnode = pdevinfo->fwnode; if (pdevinfo->dma_mask) { /* |