Merge tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb

[cascardo/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 1455579..a4429bc 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -157,9 +157,6 @@ config ARCH_USE_BUILTIN_BSWAP
         instructions should set this. And it shouldn't hurt to set it
         on architectures that don't have such instructions.
 
-config HAVE_SYSCALL_WRAPPERS
-       bool
-
 config KRETPROBES
        def_bool y
        depends on KPROBES && HAVE_KRETPROBES
@@ -216,6 +213,9 @@ config USE_GENERIC_SMP_HELPERS
 config GENERIC_SMP_IDLE_THREAD
        bool
 
+config GENERIC_IDLE_POLL_SETUP
+       bool
+
 # Select if arch init_task initializer is different to init/init_task.c
 config ARCH_INIT_TASK
        bool
@@ -384,6 +384,12 @@ config MODULES_USE_ELF_REL
          Modules only use ELF REL relocations.  Modules with ELF RELA
          relocations will give an error.
 
+config HAVE_UNDERSCORE_SYMBOL_PREFIX
+       bool
+       help
+         Some architectures generate an _ in front of C symbols; things like
+         module loading and assembly files need to know about this.
+
 #
 # ABI hall of shame
 #