Merge tag 'v3.12-rc5' into stable/for-linus-3.13

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1ad6fb6c094db415ec76a72a28356e75bdfd7d17..b08374f8fe3b15d2126e2e028264dcd6a7c36250 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1872,6 +1872,12 @@ config CC_STACKPROTECTOR
          neutralized via a kernel panic.
          This feature requires gcc version 4.2 or above.
 
+config SWIOTLB
+       def_bool y
+
+config IOMMU_HELPER
+       def_bool SWIOTLB
+
 config XEN_DOM0
        def_bool y
        depends on XEN