diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-05 08:38:01 +0200 |
commit | d8b1d4104de663bacffe18cf79ebf37fed8aac78 (patch) | |
tree | 2aceb7beb9cb45d90854d2d8e36ce108864fca46 /0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch | |
parent | 1b44a8c9fe0e71a8d14c49e78d9857f49d518a09 (diff) | |
parent | 9ab9ea2db0b13375d3d7114d5c82eb298a118740 (diff) | |
download | kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.gz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.xz kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.zip |
merge origin
Diffstat (limited to '0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch')
-rw-r--r-- | 0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch index 86cbf5dad..eea0deea2 100644 --- a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch +++ b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch @@ -28,10 +28,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 9 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 6d3448895382..221255007dc8 100644 +index 8777faced51a..2e60d792005f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1563,6 +1563,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1572,6 +1572,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; |