[i386] Re-enable INTEL_IOMMU, IRQ_REMAP

svn path=/dists/sid/linux-2.6/; revision=18717

debian/changelog

@@ -19,6 +19,7 @@ linux-2.6 (3.2.6-2) UNRELEASED; urgency=low
     - [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)

debian/config/kernelarch-x86/config

@@ -583,6 +583,13 @@ CONFIG_SERIO_RAW=m
 ##
 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
 ##
@@ -1738,10 +1745,7 @@ CONFIG_SND_HDA_INTEL=m
 ##
 ## 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

debian/config/kernelarch-x86/config-arch-64

@@ -65,9 +65,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 ##
 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