Merge x86-64 update from Andi

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8796e12c56f3..b76ce1fe2e7f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -58,6 +58,10 @@ config IA64_UNCACHED_ALLOCATOR
         bool
         select GENERIC_ALLOCATOR
 
+config ZONE_DMA_IS_DMA32
+        bool
+        default y
+
 choice
         prompt "System type"
         default IA64_GENERIC