summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-25 20:59:51 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-25 20:59:51 +0100
commitfe0a20a3eff282efae9f891fd10081a9e2b45c96 (patch)
tree48b5d81c132f9ada373464bdc0a04e1d23cfa532 /drivers/base
parentf42712a92e660fbee2193c5dde672470d099f63f (diff)
parentca5b74d2675a44f54aacb919c1cf022463e2f738 (diff)
downloadlinux-fe0a20a3eff282efae9f891fd10081a9e2b45c96.tar.bz2
Merge branch 'acpi-driver-core' into device-properties
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c2
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) {
/*