Merge tag 'media/v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index fe7e8e175db8f7b4c3e72f62c6dffeb01d0ecaee..0c8b78a9ae2ef97a1e83753146959b2d7b39d16d 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -394,6 +394,16 @@ config HAS_DMA
        depends on !NO_DMA
        default y
 
+config DMA_NOOP_OPS
+       bool
+       depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
+       default n
+
+config DMA_VIRT_OPS
+       bool
+       depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
+       default n
+
 config CHECK_SIGNATURE
        bool
 
@@ -549,7 +559,7 @@ config SBITMAP
        bool
 
 config PARMAN
-       tristate
+       tristate "parman" if COMPILE_TEST
 
 config PRIME_NUMBERS
        tristate