Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index ba1b626..f6b649d 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -205,9 +205,6 @@ config HAVE_NMI_WATCHDOG
 config HAVE_ARCH_TRACEHOOK
        bool
 
-config HAVE_DMA_ATTRS
-       bool
-
 config HAVE_DMA_CONTIGUOUS
        bool
 
@@ -632,4 +629,7 @@ config OLD_SIGACTION
 config COMPAT_OLD_SIGACTION
        bool
 
+config ARCH_NO_COHERENT_DMA_MMAP
+       bool
+
 source "kernel/gcov/Kconfig"