From 99d41ad1c5e35b4e6da25b673f16b9e49e0c6b7b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 21 Feb 2012 04:14:00 +0000
Subject: [PATCH] [i386] Re-enable INTEL_IOMMU, IRQ_REMAP

svn path=/dists/sid/linux-2.6/; revision=18717
---
 debian/changelog                            |  1 +
 debian/config/kernelarch-x86/config         | 10 +++++++---
 debian/config/kernelarch-x86/config-arch-64 |  3 ---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cea43d538..bbac28621 100644
--- a/debian/changelog
+++ b/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)
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index a412422c3..376f96e3f 100644
--- a/debian/config/kernelarch-x86/config
+++ b/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
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 62e289b0c..e75dc1c25 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/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