diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /arch/x86/Kconfig | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f46f30d23eb0..c71a8f8bdba8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -587,7 +587,6 @@ config GART_IOMMU | |||
| 587 | bool "GART IOMMU support" if EMBEDDED | 587 | bool "GART IOMMU support" if EMBEDDED |
| 588 | default y | 588 | default y |
| 589 | select SWIOTLB | 589 | select SWIOTLB |
| 590 | select AGP | ||
| 591 | depends on X86_64 && PCI | 590 | depends on X86_64 && PCI |
| 592 | ---help--- | 591 | ---help--- |
| 593 | Support for full DMA access of devices with 32bit memory access only | 592 | Support for full DMA access of devices with 32bit memory access only |