diff --git a/[refs] b/[refs] index 0331aba6e864..f0d73f1c3e38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de53e9caa4c6149ef4a78c2f83d7f5b655848767 +refs/heads/master: 96edc754aa714e51d2044af91b96cc7420c5cb01 diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index 9a02f71c6b1f..e7e55a00f94f 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/arch/ia64/Kconfig @@ -187,7 +187,7 @@ config IA64_DIG config IA64_DIG_VTD bool "DIG+Intel+IOMMU" - select DMAR + select INTEL_IOMMU select PCI_MSI config IA64_HP_ZX1