Not that x86 without ACPI sees any real use... Signed-off-by: Adam Borowski <kilobyte@xxxxxxxxxx> --- Found by randconfig builds. arch/x86/pci/intel_mid_pci.c | 2 ++ arch/x86/pci/xen.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 00c62115f39c..f14a911f0d06 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -299,8 +299,10 @@ int __init intel_mid_pci_init(void) pcibios_disable_irq = intel_mid_pci_irq_disable; pci_root_ops = intel_mid_pci_ops; pci_soc_mode = 1; +#ifdef CONFIG_ACPI /* Continue with standard init */ acpi_noirq_set(); +#endif return 1; } diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 9f9aad42ccff..681eb5c34c03 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -406,8 +406,10 @@ int __init pci_xen_init(void) pcibios_enable_irq = xen_pcifront_enable_irq; pcibios_disable_irq = NULL; +#ifdef CONFIG_ACPI /* Keep ACPI out of the picture */ acpi_noirq_set(); +#endif #ifdef CONFIG_PCI_MSI x86_msi.setup_msi_irqs = xen_setup_msi_irqs; -- 2.28.0
