diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:23 +0100 |
| commit | 3eb85368460d942005ba305829e279d0fe4767e0 (patch) | |
| tree | e4498b245f5dff9fa6836413ccb10f6df971df30 /include/linux/acpi.h | |
| parent | Merge branches 'acpi-tables', 'acpi-soc', 'acpi-apei' and 'acpi-misc' (diff) | |
| parent | ACPI: Make PCI slot detection driver depend on PCI (diff) | |
| download | linux-dev-3eb85368460d942005ba305829e279d0fe4767e0.tar.xz linux-dev-3eb85368460d942005ba305829e279d0fe4767e0.zip | |
Merge branch 'acpi-pci'
* acpi-pci:
ACPI: Make PCI slot detection driver depend on PCI
ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set
arm64: select ACPI PCI code only when both features are enabled
PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
ACPI: Allow CONFIG_PCI to be unset for reboot
ACPI: Move PCI reset to a separate function
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index f788cdbbd1b0..4b31a989788c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -340,7 +340,14 @@ struct pci_dev; int acpi_pci_irq_enable (struct pci_dev *dev); void acpi_penalize_isa_irq(int irq, int active); bool acpi_isa_irq_available(int irq); +#ifdef CONFIG_PCI void acpi_penalize_sci_irq(int irq, int trigger, int polarity); +#else +static inline void acpi_penalize_sci_irq(int irq, int trigger, + int polarity) +{ +} +#endif void acpi_pci_irq_disable (struct pci_dev *dev); extern int ec_read(u8 addr, u8 *val); |