diff options
| author | Linus Torvalds | 2009-04-03 19:36:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-03 19:36:57 +0200 |
| commit | ca1ee219c070eab755712d50638bbcd1f8630fc1 (patch) | |
| tree | c0c252a9095830aadc5dc9ffdd16d9167dd605c9 /arch/x86/Kconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache (diff) | |
| parent | intel-iommu: Fix address wrap on 32-bit kernel. (diff) | |
| download | kernel-qcow2-linux-ca1ee219c070eab755712d50638bbcd1f8630fc1.tar.gz kernel-qcow2-linux-ca1ee219c070eab755712d50638bbcd1f8630fc1.tar.xz kernel-qcow2-linux-ca1ee219c070eab755712d50638bbcd1f8630fc1.zip | |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Fix address wrap on 32-bit kernel.
intel-iommu: Enable DMAR on 32-bit kernel.
intel-iommu: fix PCI device detach from virtual machine
intel-iommu: VT-d page table to support snooping control bit
iommu: Add domain_has_cap iommu_ops
intel-iommu: Snooping control support
Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 748e50a1a152..3f27e5c0c9c9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1837,8 +1837,8 @@ config PCI_MMCONFIG config DMAR bool "Support for DMA Remapping Devices (EXPERIMENTAL)" - depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL - ---help--- + depends on PCI_MSI && ACPI && EXPERIMENTAL + help DMA remapping (DMAR) devices support enables independent address translations for Direct Memory Access (DMA) from devices. These DMA remapping devices are reported via ACPI tables |