Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 134f763..61a33f4 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -252,6 +252,9 @@ config DMA_CMA
          to allocate big physically-contiguous blocks of memory for use with
          hardware components that do not support I/O map nor scatter-gather.
 
+         You can disable CMA by specifying "cma=0" on the kernel's command
+         line.
+
          For more information see <include/linux/dma-contiguous.h>.
          If unsure, say "n".