diff --git a/[refs] b/[refs] index 516ce54cd6e6..ca04433bfc65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54b4cbd26987f84791d6e05863a715ded9f7b3a5 +refs/heads/master: 24d2ba0a8a5816eb8322836271fbcb045d915dfd diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 5a82f18ab5ed..62a2820297b1 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -552,7 +552,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT config AMD_IOMMU bool "AMD IOMMU support" select SWIOTL - depends on X86_64 && PCI + depends on X86_64 && PCI && ACPI help Select this to get support for AMD IOMMU hardware in your system.