diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a12dbb2b93f3..1d9d874cba59 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -537,9 +537,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT | |||
537 | Calgary anyway, pass 'iommu=calgary' on the kernel command line. | 537 | Calgary anyway, pass 'iommu=calgary' on the kernel command line. |
538 | If unsure, say Y. | 538 | If unsure, say Y. |
539 | 539 | ||
540 | config IOMMU_HELPER | ||
541 | def_bool (CALGARY_IOMMU || GART_IOMMU) | ||
542 | |||
543 | # need this always selected by IOMMU for the VIA workaround | 540 | # need this always selected by IOMMU for the VIA workaround |
544 | config SWIOTLB | 541 | config SWIOTLB |
545 | bool | 542 | bool |
@@ -550,6 +547,8 @@ config SWIOTLB | |||
550 | access 32-bits of memory can be used on systems with more than | 547 | access 32-bits of memory can be used on systems with more than |
551 | 3 GB of memory. If unsure, say Y. | 548 | 3 GB of memory. If unsure, say Y. |
552 | 549 | ||
550 | config IOMMU_HELPER | ||
551 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | ||
553 | 552 | ||
554 | config NR_CPUS | 553 | config NR_CPUS |
555 | int "Maximum number of CPUs (2-255)" | 554 | int "Maximum number of CPUs (2-255)" |