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 /include/acpi | |
| 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.gz linux-68eab52e712bba006333a7a2297a4d3b9ce49012.tar.bz2 linux-68eab52e712bba006333a7a2297a4d3b9ce49012.zip | |
Merge branch 'acpi-pci'
Merge the ACPI PCI topic branch depended on by the following material.
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index c6f0c41c4f5d..97e9a066417d 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -17,7 +17,6 @@ */ #define ACPI_SBS_COMPONENT 0x00100000 #define ACPI_FAN_COMPONENT 0x00200000 -#define ACPI_PCI_COMPONENT 0x00400000 #define ACPI_CONTAINER_COMPONENT 0x01000000 #define ACPI_SYSTEM_COMPONENT 0x02000000 #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000 |