Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[~andy/linux] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 91c780c973ba3b2b6e863330574115302ff8b783..9f2edb5c555179de8d00ee5d2031546df35f8a9d 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -20,6 +20,7 @@ config SPARC
        select HAVE_ARCH_TRACEHOOK
        select SYSCTL_EXCEPTION_TRACE
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select RTC_CLASS
        select RTC_DRV_M48T59
        select HAVE_IRQ_WORK
@@ -39,6 +40,7 @@ config SPARC
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+       select MODULES_USE_ELF_RELA
 
 config SPARC32
        def_bool !64BIT