diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
| commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
| tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /arch/powerpc/Kconfig | |
| parent | 637cfeb9f99ca097747139a5419bc23e0b885655 (diff) | |
| parent | 4a605e2d1a69f5aea06da10d81e22802a90812a3 (diff) | |
| download | linux-d0055df0c9c1471c389197a69f43e300185a75aa.tar.gz linux-d0055df0c9c1471c389197a69f43e300185a75aa.tar.bz2 linux-d0055df0c9c1471c389197a69f43e300185a75aa.zip | |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 08908219fba9..8af6a7d93148 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -119,9 +119,6 @@ config GENERIC_HWEIGHT bool default y -config ARCH_HAS_DMA_SET_COHERENT_MASK - bool - config PPC bool default y @@ -130,7 +127,6 @@ config PPC # select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEVMEM_IS_ALLOWED - select ARCH_HAS_DMA_SET_COHERENT_MASK select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL @@ -887,6 +883,7 @@ config FSL_SOC config FSL_PCI bool + select ARCH_HAS_DMA_SET_MASK select PPC_INDIRECT_PCI select PCI_QUIRKS |