diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 22:23:02 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 22:23:02 (GMT) |
| commit | 66f5854c6894dc028fc13345838c6f82bfcfef0c (patch) | |
| tree | 76ac271549bca0d1199df15e1087dcd0d3c6e911 /drivers/platform | |
| parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
| parent | 1571875beecd5de9657f73931449bda1b1329b6f (diff) | |
| download | linux-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.xz | |
Merge branch 'device-properties'
* device-properties:
ACPI / platform: Add support for build-in properties
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel-hid.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/intel-vbtn.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c index ed58742..12dbb50 100644 --- a/drivers/platform/x86/intel-hid.c +++ b/drivers/platform/x86/intel-hid.c @@ -264,7 +264,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; if (acpi_match_device_ids(dev, ids) == 0) - if (acpi_create_platform_device(dev)) + if (acpi_create_platform_device(dev, NULL)) dev_info(&dev->dev, "intel-hid: created platform device\n"); diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c index 146d02f..7808076 100644 --- a/drivers/platform/x86/intel-vbtn.c +++ b/drivers/platform/x86/intel-vbtn.c @@ -164,7 +164,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; if (acpi_match_device_ids(dev, ids) == 0) - if (acpi_create_platform_device(dev)) + if (acpi_create_platform_device(dev, NULL)) dev_info(&dev->dev, "intel-vbtn: created platform device\n"); |