Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

[firefly-linux-kernel-4.4.55.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 5b448a74d0f756a41eb275639efef22186f55d66..684eb5af439dc5cee005f51675c2db814a29bf38 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -120,6 +120,9 @@ config HAVE_KRETPROBES
 
 config HAVE_OPTPROBES
        bool
+
+config HAVE_NMI_WATCHDOG
+       bool
 #
 # An arch should select this if it provides all these things:
 #
@@ -210,4 +213,7 @@ config HAVE_CMPXCHG_LOCAL
 config HAVE_CMPXCHG_DOUBLE
        bool
 
+config ARCH_WANT_OLD_COMPAT_IPC
+       bool
+
 source "kernel/gcov/Kconfig"