diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 82105349612d..6fbb3639d7bb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -642,7 +642,7 @@ source "kernel/Kconfig.preempt" | |||
642 | 642 | ||
643 | config X86_UP_APIC | 643 | config X86_UP_APIC |
644 | bool "Local APIC support on uniprocessors" | 644 | bool "Local APIC support on uniprocessors" |
645 | depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH) | 645 | depends on X86_32 && !SMP && !X86_GENERICARCH |
646 | help | 646 | help |
647 | A local APIC (Advanced Programmable Interrupt Controller) is an | 647 | A local APIC (Advanced Programmable Interrupt Controller) is an |
648 | integrated interrupt controller in the CPU. If you have a single-CPU | 648 | integrated interrupt controller in the CPU. If you have a single-CPU |
@@ -667,11 +667,11 @@ config X86_UP_IOAPIC | |||
667 | 667 | ||
668 | config X86_LOCAL_APIC | 668 | config X86_LOCAL_APIC |
669 | def_bool y | 669 | def_bool y |
670 | depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 670 | depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC |
671 | 671 | ||
672 | config X86_IO_APIC | 672 | config X86_IO_APIC |
673 | def_bool y | 673 | def_bool y |
674 | depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 674 | depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC |
675 | 675 | ||
676 | config X86_VISWS_APIC | 676 | config X86_VISWS_APIC |
677 | def_bool y | 677 | def_bool y |