diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
| commit | 66f5854c6894dc028fc13345838c6f82bfcfef0c (patch) | |
| tree | 76ac271549bca0d1199df15e1087dcd0d3c6e911 /drivers/acpi/scan.c | |
| parent | Linux 4.9-rc4 (diff) | |
| parent | ACPI / platform: Add support for build-in properties (diff) | |
| download | linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.xz linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.zip | |
Merge branch 'device-properties'
* device-properties:
ACPI / platform: Add support for build-in properties
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 035ac646d8db..3d1856f1f4d0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1734,7 +1734,7 @@ static void acpi_default_enumeration(struct acpi_device *device) &is_spi_i2c_slave); acpi_dev_free_resource_list(&resource_list); if (!is_spi_i2c_slave) { - acpi_create_platform_device(device); + acpi_create_platform_device(device, NULL); acpi_device_set_enumerated(device); } else { blocking_notifier_call_chain(&acpi_reconfig_chain, |