diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-08 16:54:00 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-08 16:54:00 +0100 |
commit | 68eab52e712bba006333a7a2297a4d3b9ce49012 (patch) | |
tree | 23c4bb29207a2544346d1313c8306974dd182073 /drivers/acpi/sysfs.c | |
parent | ACPI: processor: Get rid of ACPICA message printing (diff) | |
parent | ACPI: PCI: Replace direct printk() invocations in pci_link.c (diff) | |
download | linux-68eab52e712bba006333a7a2297a4d3b9ce49012.tar.xz linux-68eab52e712bba006333a7a2297a4d3b9ce49012.zip |
Merge branch 'acpi-pci'
Merge the ACPI PCI topic branch depended on by the following material.
Diffstat (limited to 'drivers/acpi/sysfs.c')
-rw-r--r-- | drivers/acpi/sysfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 4974e9280dc0..4f27d7820784 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -54,7 +54,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = { ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT), ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT), - ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT), ACPI_DEBUG_INIT(ACPI_CONTAINER_COMPONENT), ACPI_DEBUG_INIT(ACPI_SYSTEM_COMPONENT), ACPI_DEBUG_INIT(ACPI_MEMORY_DEVICE_COMPONENT), |