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/acpi/dock.c | |
| parent | f42712a92e660fbee2193c5dde672470d099f63f (diff) | |
| parent | ca5b74d2675a44f54aacb919c1cf022463e2f738 (diff) | |
Merge branch 'acpi-driver-core' into device-properties
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index d9339b442a4e..a688aa243f6c 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -615,7 +615,7 @@ void acpi_dock_add(struct acpi_device *adev) memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.name = "dock"; pdevinfo.id = dock_station_count; - pdevinfo.acpi_node.companion = adev; + pdevinfo.fwnode = acpi_fwnode_handle(adev); pdevinfo.data = &ds; pdevinfo.size_data = sizeof(ds); dd = platform_device_register_full(&pdevinfo); |