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 /arch/x86 | |
| parent | 4cd9da8ad1c98a2c9c2b30cbd5c40faba0047bae (diff) | |
| parent | 5c6a1177826e5207306511a480b5aae79fd0fefb (diff) | |
| download | linux-3eb85368460d942005ba305829e279d0fe4767e0.tar.gz linux-3eb85368460d942005ba305829e279d0fe4767e0.tar.bz2 linux-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 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 959d618dbb17..73bb404f4d2a 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -121,7 +121,14 @@ extern void __init dmi_check_pciprobe(void); extern void __init dmi_check_skip_isa_align(void); /* some common used subsys_initcalls */ +#ifdef CONFIG_PCI extern int __init pci_acpi_init(void); +#else +static inline int __init pci_acpi_init(void) +{ + return -EINVAL; +} +#endif extern void __init pcibios_irq_init(void); extern int __init pcibios_init(void); extern int pci_legacy_init(void); |