Update from upstream with manual merge of Yasunori Goto's

[net-next-2.6.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 945c15a0722b894eeac86f2778326313eadf4b5f..8f699a2e79817a033b24715a1c091635191f1580 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -26,6 +26,10 @@ config MMU
        bool
        default y
 
+config SWIOTLB
+       bool
+       default y
+
 config RWSEM_XCHGADD_ALGORITHM
        bool
        default y