Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-09-05 10:27:49 +0200
committerTakashi Iwai <tiwai@suse.de>2019-09-05 10:27:49 +0200
commit508053cd3a5bff83bc7c5ddc5a16aaceff36172c (patch)
tree70b4997f15c7c747b624a1e65234985319637b6a
parente9bdc2dd2bacad645a5778cafa77f5eacbb56c67 (diff)
parent6cbb147ca88b7ab55943c493048fd03954d72644 (diff)
Merge branch 'users/jlee/SLE15/for-next' into SLE15
Pull arm64 config update 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 c99f27141e..bbcac9edce 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -465,7 +465,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=m
@@ -6677,7 +6678,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