diff --git a/[refs] b/[refs]
index 9341eb56779e..691bc39d4a67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1393c3edc307e0a2ec4274f67e342907ffd7deb5
+refs/heads/master: ff9569bc5558e958777fd43580f2ccd83733cdf6
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index b76ce1fe2e7f..199eeaf0f4e3 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR
 	bool
 	select GENERIC_ALLOCATOR
 
-config ZONE_DMA_IS_DMA32
+config DMA_IS_DMA32
 	bool
 	default y