Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress', 'asoc/fix/fsl...

[firefly-linux-kernel-4.4.55.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index cced84233ac0f9e11f0b7a3ddb5dad39817325a9..7a8f1c5e65af19fce7bd7460fcc59cad5df2e905 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -67,7 +67,7 @@ config XEN_PCIDEV_FRONTEND
 config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
-       depends on PCI && X86_LOCAL_APIC && X86_IO_APIC
+       depends on PCI && X86_LOCAL_APIC
        help
           This allows native hypertransport devices to use interrupts.
 
@@ -110,13 +110,6 @@ config PCI_PASID
 
          If unsure, say N.
 
-config PCI_IOAPIC
-       bool "PCI IO-APIC hotplug support" if X86
-       depends on PCI
-       depends on ACPI
-       depends on X86_IO_APIC
-       default !X86
-
 config PCI_LABEL
        def_bool y if (DMI || ACPI)
        select NLS