diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 09:31:35 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 09:31:35 +0200 |
commit | 6bdb486c5a628f7a927c2658166e3a5ef1f883e7 (patch) | |
tree | 4b817231c6f48216bc0deff7075c91b6c3ebdf35 /drivers/acpi/dptf | |
parent | da6d647598a6d182eb6a0344a7b14ae005244399 (diff) | |
parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
download | linux-stable-6bdb486c5a628f7a927c2658166e3a5ef1f883e7.tar.gz linux-stable-6bdb486c5a628f7a927c2658166e3a5ef1f883e7.tar.bz2 linux-stable-6bdb486c5a628f7a927c2658166e3a5ef1f883e7.zip |
Merge 5.8-rc6 into driver-core-next
We need the driver core fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/dptf')
-rw-r--r-- | drivers/acpi/dptf/dptf_power.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index 5fab7e350db8..92b996a564d0 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -228,6 +228,7 @@ static const struct acpi_device_id int3407_device_ids[] = { {"INT3407", 0}, {"INT3532", 0}, {"INTC1047", 0}, + {"INTC1050", 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3407_device_ids); |