aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorBin Gao <bin.gao@linux.intel.com>2012-10-25 09:35:44 -0700
committerIngo Molnar <mingo@kernel.org>2012-10-26 12:20:38 +0200
commit6e87f9b7e48e165cb8e6092b9abe682e7065614a (patch)
treea51548385f6c4749d288ea801f3682fbc162c20a /arch/x86/Kconfig
parentx86/boot/doc: Fix grammar and typo in boot.txt (diff)
downloadlinux-dev-6e87f9b7e48e165cb8e6092b9abe682e7065614a.tar.xz
linux-dev-6e87f9b7e48e165cb8e6092b9abe682e7065614a.zip
arch/x86/Kconfig: Allow turning off CONFIG_X86_MPPARSE when either ACPI or SFI is present
MPS tables are not needed for systems that have proper ACPI support. This is also true for systems that have SFI in place. So this patch allows the configuration (turning off) of CONFIG_X86_MPPARSE when either ACPI or SFI is present. Signed-off-by: Bin Gao <bin.gao@intel.com> Cc: Len Brown <len.brown@intel.com> Cc: Bin Gao <bin.gao@linux.intel.com> Link: http://lkml.kernel.org/r/20121025163544.GB38477@bingao-desk1.fm.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 46c3bff3ced2..b1494bd92b65 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -310,7 +310,7 @@ config X86_X2APIC
If you don't know what to do here, say N.
config X86_MPPARSE
- bool "Enable MPS table" if ACPI
+ bool "Enable MPS table" if ACPI || SFI
default y
depends on X86_LOCAL_APIC
---help---