Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 84caf50725b53e829df2a39baa059084d63663e4..770f717bd250c2c0965b6477e2b6b205b8f37dbe 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -41,6 +41,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        default y