Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index e68ab79df28bbc9e84c3e2f6f17f92369144c96d..ebf034b97278592ab57cbd24ef0f53d3cfc56e0a 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -463,7 +463,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) {
                /*