Merge git://git.infradead.org/users/willy/linux-nvme

[karo-tx-linux.git] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 97da3c17b424bd3d65e611311cb6160030a37c60..e46c2147397f56ef25896f58139190dd9cb40899 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -43,9 +43,9 @@ config EARLY_PRINTK
          with klogd/syslogd or the X server. You should normally N here,
          unless you want to debug such a crash.
 
-config EARLY_PRINTK_MRST
-       bool "Early printk for MRST platform support"
-       depends on EARLY_PRINTK && X86_MRST
+config EARLY_PRINTK_INTEL_MID
+       bool "Early printk for Intel MID platform support"
+       depends on EARLY_PRINTK && X86_INTEL_MID
 
 config EARLY_PRINTK_DBGP
        bool "Early printk via EHCI debug port"
@@ -289,7 +289,7 @@ config DEBUG_STRICT_USER_COPY_CHECKS
 
 config DEBUG_NMI_SELFTEST
        bool "NMI Selftest"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && X86_LOCAL_APIC
        ---help---
          Enabling this option turns on a quick NMI selftest to verify
          that the NMI behaves correctly.