diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index afb75f5c243cd6b7eff21f7b3537dc70f141c23e..c226c2bda7f3b248e64b325ca2f6a22e62e1b2c2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -859,7 +859,8 @@ config UP_LATE_INIT depends on !SMP && X86_LOCAL_APIC config X86_UP_APIC - bool "Local APIC support on uniprocessors" + bool "Local APIC support on uniprocessors" if !PCI_MSI + default PCI_MSI depends on X86_32 && !SMP && !X86_32_NON_STANDARD ---help--- A local APIC (Advanced Programmable Interrupt Controller) is an @@ -871,10 +872,6 @@ config X86_UP_APIC performance counters), and the NMI watchdog which detects hard lockups. -config X86_UP_APIC_MSI - def_bool y - select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI - config X86_UP_IOAPIC bool "IO-APIC support on uniprocessors" depends on X86_UP_APIC