diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 15:59:51 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-25 15:59:51 -0400 |
| commit | fe0a20a3eff282efae9f891fd10081a9e2b45c96 (patch) | |
| tree | 48b5d81c132f9ada373464bdc0a04e1d23cfa532 /drivers/base | |
| parent | f42712a92e660fbee2193c5dde672470d099f63f (diff) | |
| parent | ca5b74d2675a44f54aacb919c1cf022463e2f738 (diff) | |
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( | |||
| 454 | goto err_alloc; | 454 | goto err_alloc; |
| 455 | 455 | ||
| 456 | pdev->dev.parent = pdevinfo->parent; | 456 | pdev->dev.parent = pdevinfo->parent; |
| 457 | ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion); | 457 | pdev->dev.fwnode = pdevinfo->fwnode; |
| 458 | 458 | ||
| 459 | if (pdevinfo->dma_mask) { | 459 | if (pdevinfo->dma_mask) { |
| 460 | /* | 460 | /* |