Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-beck.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 34aa19352dc1ab87cc2cf11f38e1161dc547a518..eefd9a4ed156753b6f07cb41cd0cb97ca0f99a48 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -10,10 +10,12 @@ config FRV
        select HAVE_DEBUG_BUGVERBOSE
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CPU_DEVICES
+       select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_WANT_IPC_PARSE_VERSION
        select OLD_SIGSUSPEND3
        select OLD_SIGACTION
        select HAVE_DEBUG_STACKOVERFLOW
+       select ARCH_NO_COHERENT_DMA_MMAP
 
 config ZONE_DMA
        bool