summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-01-13 17:22:29 -0500
committerDave Jones <davej@redhat.com>2012-01-13 17:22:29 -0500
commit010a4f2c6bcc04062ba09331a9f6193ed273e139 (patch)
tree308d66b3720b868537144d996d8786fe7ba45f0f /config-x86_64-generic
parent96cb8049526b951ddc775581db6052adf229ae43 (diff)
downloadkernel-010a4f2c6bcc04062ba09331a9f6193ed273e139.tar.gz
kernel-010a4f2c6bcc04062ba09331a9f6193ed273e139.tar.xz
kernel-010a4f2c6bcc04062ba09331a9f6193ed273e139.zip
Disable Calgary IOMMU
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic3
1 files changed, 1 insertions, 2 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 10ce2513a..85aaae8cb 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -22,8 +22,7 @@ CONFIG_AMD_IOMMU=y
CONFIG_AMD_IOMMU_STATS=y
# CONFIG_IOMMU_DEBUG is not set
CONFIG_SWIOTLB=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+# CONFIG_CALGARY_IOMMU is not set
CONFIG_KEXEC_JUMP=y