Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / drivers / acpi / property.c

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index d04de10..24e87b6 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -76,7 +76,7 @@ static bool acpi_nondev_subnode_extract(const union acpi_object *desc,
                return false;
 
        dn->name = link->package.elements[0].string.pointer;
-       dn->fwnode.ops = &acpi_data_fwnode_ops;
+       fwnode_init(&dn->fwnode, &acpi_data_fwnode_ops);
        dn->parent = parent;
        INIT_LIST_HEAD(&dn->data.properties);
        INIT_LIST_HEAD(&dn->data.subnodes);