diff --git a/[refs] b/[refs] index 9fd730e886ac..b8512b5a8247 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92af4e29020ff096178a00605b3662b3b39d4aa9 +refs/heads/master: 07c40e8a1acdb56fca485a6deeb252ebf19509a1 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 62a2820297b1..8aae462f4e01 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -551,7 +551,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT config AMD_IOMMU bool "AMD IOMMU support" - select SWIOTL + select SWIOTLB depends on X86_64 && PCI && ACPI help Select this to get support for AMD IOMMU hardware in your system.