Merge tag 'docs-4.18' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3ac9bf4..792437d 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -29,7 +29,6 @@ config IA64
        select HAVE_FUNCTION_TRACER
        select TTY
        select HAVE_ARCH_TRACEHOOK
-       select HAVE_DMA_API_DEBUG
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_VIRT_CPU_ACCOUNTING
@@ -54,6 +53,8 @@ config IA64
        select MODULES_USE_ELF_RELA
        select ARCH_USE_CMPXCHG_LOCKREF
        select HAVE_ARCH_AUDITSYSCALL
+       select NEED_DMA_MAP_STATE
+       select NEED_SG_DMA_LENGTH
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -78,18 +79,6 @@ config MMU
        bool
        default y
 
-config ARCH_DMA_ADDR_T_64BIT
-       def_bool y
-
-config NEED_DMA_MAP_STATE
-       def_bool y
-
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
-config SWIOTLB
-       bool
-
 config STACKTRACE_SUPPORT
        def_bool y
 
@@ -146,7 +135,6 @@ config IA64_GENERIC
        bool "generic"
        select NUMA
        select ACPI_NUMA
-       select DMA_DIRECT_OPS
        select SWIOTLB
        select PCI_MSI
        help
@@ -167,7 +155,6 @@ config IA64_GENERIC
 
 config IA64_DIG
        bool "DIG-compliant"
-       select DMA_DIRECT_OPS
        select SWIOTLB
 
 config IA64_DIG_VTD
@@ -183,7 +170,6 @@ config IA64_HP_ZX1
 
 config IA64_HP_ZX1_SWIOTLB
        bool "HP-zx1/sx1000 with software I/O TLB"
-       select DMA_DIRECT_OPS
        select SWIOTLB
        help
          Build a kernel that runs on HP zx1 and sx1000 systems even when they
@@ -207,7 +193,6 @@ config IA64_SGI_UV
        bool "SGI-UV"
        select NUMA
        select ACPI_NUMA
-       select DMA_DIRECT_OPS
        select SWIOTLB
        help
          Selecting this option will optimize the kernel for use on UV based
@@ -218,7 +203,6 @@ config IA64_SGI_UV
 
 config IA64_HP_SIM
        bool "Ski-simulator"
-       select DMA_DIRECT_OPS
        select SWIOTLB
        depends on !PM
 
@@ -613,6 +597,3 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
-
-config IOMMU_HELPER
-       def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)