Merge branch 'bugzilla-15749' into release

[linux.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index bd7261ea8f9401adcf96e7df1664a9042401cdd6..75291fdd379fa5aaa735fb2467329c858b34c56a 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -10,6 +10,7 @@ config ALPHA
        select HAVE_OPROFILE
        select HAVE_SYSCALL_WRAPPERS
        select HAVE_PERF_EVENTS
+       select HAVE_DMA_ATTRS
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,
@@ -58,6 +59,9 @@ config ZONE_DMA
        bool
        default y
 
+config NEED_DMA_MAP_STATE
+       def_bool y
+
 config GENERIC_ISA_DMA
        bool
        default y