diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-10 20:01:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-10 20:01:58 +0100 |
| commit | 2a148b6f2726ced30f796435f61d6e915c979784 (patch) | |
| tree | 48d233fa5639677b16b10a3442029f3a2e40ef92 /drivers/iommu/Kconfig | |
| parent | ASoC: rsnd: fixup SCU_SYS_INT_EN1 address (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and '... (diff) | |
| download | linux-2a148b6f2726ced30f796435f61d6e915c979784.tar.xz linux-2a148b6f2726ced30f796435f61d6e915c979784.zip | |
Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar
ASoC: Updates for v4.4
Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones. Highlights include:
- Updates to the topology userspace interface
- Big updates to the Renesas support from Morimoto-san
- Most of the support for Intel Sky Lake systems.
- New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
S/PDIF.
Diffstat (limited to 'drivers/iommu/Kconfig')
| -rw-r--r-- | drivers/iommu/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 4664c2a96c67..cbe6a890a93a 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -23,8 +23,7 @@ config IOMMU_IO_PGTABLE config IOMMU_IO_PGTABLE_LPAE bool "ARMv7/v8 Long Descriptor Format" select IOMMU_IO_PGTABLE - # SWIOTLB guarantees a dma_to_phys() implementation - depends on ARM || ARM64 || (COMPILE_TEST && SWIOTLB) + depends on HAS_DMA && (ARM || ARM64 || COMPILE_TEST) help Enable support for the ARM long descriptor pagetable format. This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page @@ -43,7 +42,7 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST endmenu config IOMMU_IOVA - bool + tristate config OF_IOMMU def_bool y |