---

yaml --- r: 120764 b: refs/heads/master c: 7a52768 h: refs/heads/master v: v3
git-mirror · Oct 30, 2008 · 87d29c6 · 87d29c6
1 parent 07f8d72
commit 87d29c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad38dab01323a01e825555fc46863b73cd0efdc7
+refs/heads/master: 7a5276889cfa96619bf863c87581005f46139986
diff --git a/trunk/arch/x86/Kconfig b/trunk/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"