From 3ef74cce1651d6b28ad383f6d32f60c13a985587 Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Mon, 12 Dec 2005 00:37:37 -0800
Subject: [PATCH] --- yaml --- r: 15041 b: refs/heads/master c:
 ff9569bc5558e958777fd43580f2ccd83733cdf6 h: refs/heads/master i:   15039:
 42303fc8d9abd0a082d937c36d0e2bf3b5c3a873 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/ia64/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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