Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index db7c55de92cdc2ded0583d1ccc5239bdb4828d00..7942b333e46cd46c11ac0f4a849c7b98efeee58e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -157,3 +157,9 @@ config RESOURCES_64BIT
        default 64BIT
        help
          This option allows memory and IO resources to be 64 bit.
+
+config ZONE_DMA_FLAG
+       int
+       default "0" if !ZONE_DMA
+       default "1"
+