Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-09-05 17:12:11 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-09-05 17:12:11 +0200
commitaea4025891cf19a3174e7d470fdcb93153e0c8bb (patch)
tree7ffe58fb08bd0c2684cab3efb45a2da2d87a843c
parentf5f968ed8136030dd62b53c0c298fad603de91d6 (diff)
parent2628c46432dbac13f3badba3e5b0e41e0bcb000b (diff)
Merge branch 'users/jlee/SLE15-SP1/for-next' into SLE15-SP1
Pull ARM64 hotplug fix from Joey Lee
-rw-r--r--config/arm64/default5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 60b374d979..b3ba1f5a67 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -469,7 +469,8 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_LABEL=y
CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_ACPI is not set
+CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_SHPC=y
@@ -6879,7 +6880,7 @@ CONFIG_ACPI_CUSTOM_DSDT_FILE=""
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TABLE_UPGRADE=y
# CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_HED=y
# CONFIG_ACPI_CUSTOM_METHOD is not set