Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index db7c55de92cdc2ded0583d1ccc5239bdb4828d00..8ac412b45f1882cee49d35ec6ad8ef58ce04a402 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -157,3 +157,14 @@ 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"
+
+config NR_QUICK
+       int
+       depends on QUICKLIST
+       default "2" if (SUPERH && !SUPERH64)
+       default "1"