[kernel] r18717 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Tue Feb 21 04:14:00 2012
New Revision: 18717

Log:
[i386] Re-enable INTEL_IOMMU, IRQ_REMAP

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Feb 21 04:06:19 2012	(r18716)
+++ dists/sid/linux-2.6/debian/changelog	Tue Feb 21 04:14:00 2012	(r18717)
@@ -19,6 +19,7 @@
     - [alpha] Disable BLK_DEV_4DRIVES, BLK_DEV_ALI14XX, BLK_DEV_DTC2278,
       BLK_DEV_HT6560B, BLK_DEV_QD65XX, BLK_DEV_UMC8672
   * fs: Enable EFI_PARTITION in all configurations (Closes: #660582)
+  * [i386] Re-enable INTEL_IOMMU, IRQ_REMAP
 
   [ Bastian Blank ]
   * Don't advertise Xen support for rt images. (closes: #659988)

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Tue Feb 21 04:06:19 2012	(r18716)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Tue Feb 21 04:14:00 2012	(r18717)
@@ -584,6 +584,13 @@
 CONFIG_INPUT_TOUCHSCREEN=y
 
 ##
+## file: drivers/iommu/Kconfig
+##
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_IRQ_REMAP=y
+
+##
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
@@ -1738,10 +1745,7 @@
 ##
 ## file: unknown
 ##
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
 # CONFIG_ET131X_DEBUG is not set
-CONFIG_INTR_REMAP=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_POHMELFS_CRYPTO=y
 # CONFIG_XEN_DEBUG is not set

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Feb 21 04:06:19 2012	(r18716)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Feb 21 04:14:00 2012	(r18717)
@@ -65,9 +65,6 @@
 ##
 CONFIG_AMD_IOMMU=y
 # CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_IRQ_REMAP=y
 
 ##
 ## file: drivers/macintosh/Kconfig