diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 13:36:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 13:36:57 -0400 |
| commit | ca1ee219c070eab755712d50638bbcd1f8630fc1 (patch) | |
| tree | c0c252a9095830aadc5dc9ffdd16d9167dd605c9 /arch/x86/Kconfig | |
| parent | 3cc50ac0dbda5100684e570247782330155d35e0 (diff) | |
| parent | afeeb7cebbd223ffee303fd8de4ba97458b13581 (diff) | |
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 | |||
| 1837 | 1837 | ||
| 1838 | config DMAR | 1838 | config DMAR |
| 1839 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" | 1839 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" |
| 1840 | depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL | 1840 | depends on PCI_MSI && ACPI && EXPERIMENTAL |
| 1841 | ---help--- | 1841 | help |
| 1842 | DMA remapping (DMAR) devices support enables independent address | 1842 | DMA remapping (DMAR) devices support enables independent address |
| 1843 | translations for Direct Memory Access (DMA) from devices. | 1843 | translations for Direct Memory Access (DMA) from devices. |
| 1844 | These DMA remapping devices are reported via ACPI tables | 1844 | These DMA remapping devices are reported via ACPI tables |