From c957c7fa68ebfe8eb02a4dfc75f1993bd0a9fdd3 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 3 Jan 2007 09:26:21 +0000
Subject: [PATCH] --- yaml --- r: 46255 b: refs/heads/master c:
 d1598e05faa11d9f04e0a226122dd57674fb1dab h: refs/heads/master i:   46253:
 f14bd7f7a369715ca272cf2ffbb89048ed37690f   46251:
 65e4c5391d2f40e4fb07db1057b9b6744e5c3670   46247:
 09d1e9e22337bb1fd1fe2c1246fa42e53a80f878   46239:
 5b9841f4081602140f6d5a96e3a5fb2c406fa7db v: v3

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

diff --git a/[refs] b/[refs]
index 9c762a9cacaf..c506312e2816 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 980dbfd421c8d33edbd2fbc8f5a6233ccbefb052
+refs/heads/master: d1598e05faa11d9f04e0a226122dd57674fb1dab
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 4b35c93eca2f..f1d2899e9a62 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -30,7 +30,6 @@ config MMU
 
 config SWIOTLB
        bool
-       default y
 
 config RWSEM_XCHGADD_ALGORITHM
 	bool
@@ -88,6 +87,7 @@ config IA64_GENERIC
 	bool "generic"
 	select NUMA
 	select ACPI_NUMA
+	select SWIOTLB
 	help
 	  This selects the system type of your hardware.  A "generic" kernel
 	  will run on any supported IA-64 system.  However, if you configure
@@ -104,6 +104,7 @@ config IA64_GENERIC
 
 config IA64_DIG
 	bool "DIG-compliant"
+	select SWIOTLB
 
 config IA64_HP_ZX1
 	bool "HP-zx1/sx1000"
@@ -113,6 +114,7 @@ config IA64_HP_ZX1
 
 config IA64_HP_ZX1_SWIOTLB
 	bool "HP-zx1/sx1000 with software I/O TLB"
+	select SWIOTLB
 	help
 	  Build a kernel that runs on HP zx1 and sx1000 systems even when they
 	  have broken PCI devices which cannot DMA to full 32 bits.  Apart
@@ -131,6 +133,7 @@ config IA64_SGI_SN2
 
 config IA64_HP_SIM
 	bool "Ski-simulator"
+	select SWIOTLB
 
 endchoice