diff --git a/[refs] b/[refs] index fae654c66d7d..499c5718a8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2f1b424900715ed9d1699c3bb88a434a2b42bc0 +refs/heads/master: d1e3dfdc2c934a279bcfa19359e4daec02bda18f diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index 3b4248cff9a7..3dba24c318b7 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/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