summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 07:55:58 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 07:55:58 +0400
commit507447473756e316f3f182324071389a51736a83 (patch)
tree39afec5235c3309179ee4da23866f20604a3d1e2 /arch
parent0019fab3558c8c8135c88c3d38f24ab0a5408aa6 (diff)
parent6e87f9b7e48e165cb8e6092b9abe682e7065614a (diff)
downloadlinux-507447473756e316f3f182324071389a51736a83.tar.xz
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot changes from Ingo Molnar: "Two small changes: a cleanup and allow CONFIG_X86_MPPARSE to be turned off on SFI as well." * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: arch/x86/Kconfig: Allow turning off CONFIG_X86_MPPARSE when either ACPI or SFI is present x86/boot/doc: Fix grammar and typo in boot.txt
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 110cfad24f26..6c304438b503 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---