Merge branch 'linus' into core/generic-dma-coherent

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 43d6989c275f3432a0404771af92015f13717a01..250e02c8f8f9b6f68e33a008b5cab014068b8902 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -802,6 +802,10 @@ config PROC_PAGE_MONITOR
 
 endmenu                # General setup
 
+config HAVE_GENERIC_DMA_COHERENT
+       bool
+       default n
+
 config SLABINFO
        bool
        depends on PROC_FS