Merge remote-tracking branch 'signal/for-next'

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

diff --git a/arch/Kconfig b/arch/Kconfig
index 892d6176fcf3545c175e1370cf258e7e722d37c2..dd0e8eb8042f746cc7072c0bf67d1fac8c0d4a7e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -316,13 +316,6 @@ config ARCH_WANT_OLD_COMPAT_IPC
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        bool
 
-config HAVE_VIRT_TO_BUS
-       bool
-       help
-         An architecture should select this if it implements the
-         deprecated interface virt_to_bus().  All new architectures
-         should probably not select this.
-
 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help
@@ -388,6 +381,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
 #