[kernel] r18561 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Wed Jan 18 05:38:35 2012
New Revision: 18561

Log:
[amd64] iommu: Enable INTEL_IOMMU, INTEL_IOMMU_FLOPPY_WA

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jan 18 04:31:52 2012	(r18560)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jan 18 05:38:35 2012	(r18561)
@@ -24,6 +24,7 @@
   * Input: ALPS - add support for protocol versions 3 and 4
     (Closes: #618422, #648207)
   * [powerpc/powerpc64] udeb: Drop zlib-modules; ZLIB_DEFLATE is built-in
+  * [amd64] iommu: Enable INTEL_IOMMU, INTEL_IOMMU_FLOPPY_WA
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed Jan 18 04:31:52 2012	(r18560)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed Jan 18 05:38:35 2012	(r18561)
@@ -75,6 +75,9 @@
 ##
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 ##
 ## file: drivers/macintosh/Kconfig