diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 350bee1d54dc2ae41851f503d9ef7705a0e93e31..f843de13e2421bc10515f8f4a8f08ce7e2b0b666 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
 	def_bool y
 	depends on X86_MPPARSE || X86_VOYAGER
 
-if ACPI
 config X86_MPPARSE
-	def_bool y
-	bool "Enable MPS table"
+	bool "Enable MPS table" if ACPI
+	default y
 	depends on X86_LOCAL_APIC
 	help
 	  For old smp systems that do not have proper acpi support. Newer systems
 	  (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
-endif
-
-if !ACPI
-config X86_MPPARSE
-	def_bool y
-	depends on X86_LOCAL_APIC
-endif
 
 choice
 	prompt "Subarchitecture Type"