[i386] Re-enable INTEL_IOMMU, IRQ_REMAP

svn path=/dists/sid/linux-2.6/; revision=18717
This commit is contained in:
Ben Hutchings 2012-02-21 04:14:00 +00:00
parent 842fcf9eaf
commit 99d41ad1c5
3 changed files with 8 additions and 6 deletions

1
debian/changelog vendored
View File

@ -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, - [alpha] Disable BLK_DEV_4DRIVES, BLK_DEV_ALI14XX, BLK_DEV_DTC2278,
BLK_DEV_HT6560B, BLK_DEV_QD65XX, BLK_DEV_UMC8672 BLK_DEV_HT6560B, BLK_DEV_QD65XX, BLK_DEV_UMC8672
* fs: Enable EFI_PARTITION in all configurations (Closes: #660582) * fs: Enable EFI_PARTITION in all configurations (Closes: #660582)
* [i386] Re-enable INTEL_IOMMU, IRQ_REMAP
[ Bastian Blank ] [ Bastian Blank ]
* Don't advertise Xen support for rt images. (closes: #659988) * Don't advertise Xen support for rt images. (closes: #659988)

View File

@ -583,6 +583,13 @@ CONFIG_SERIO_RAW=m
## ##
CONFIG_INPUT_TOUCHSCREEN=y 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 ## file: drivers/isdn/Kconfig
## ##
@ -1738,10 +1745,7 @@ CONFIG_SND_HDA_INTEL=m
## ##
## file: unknown ## file: unknown
## ##
CONFIG_DMAR=y
# CONFIG_DMAR_DEFAULT_ON is not set
# CONFIG_ET131X_DEBUG is not set # CONFIG_ET131X_DEBUG is not set
CONFIG_INTR_REMAP=y
# CONFIG_MTD_DEBUG is not set # CONFIG_MTD_DEBUG is not set
CONFIG_POHMELFS_CRYPTO=y CONFIG_POHMELFS_CRYPTO=y
# CONFIG_XEN_DEBUG is not set # CONFIG_XEN_DEBUG is not set

View File

@ -65,9 +65,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
## ##
CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU=y
# CONFIG_AMD_IOMMU_STATS is not set # 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 ## file: drivers/macintosh/Kconfig