diff options
| -rw-r--r-- | config-x86_64-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 4 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 diff --git a/kernel.spec b/kernel.spec index 21183c4ef..62a393255 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2318,6 +2318,9 @@ fi # || || %changelog * Fri Jan 13 2012 Dave Jones <davej@redhat.com> +- Disable Calgary IOMMU + +* Fri Jan 13 2012 Dave Jones <davej@redhat.com> - Disable MTD * Fri Jan 13 2012 Dave Jones <davej@redhat.com> |