From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 01:14:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'lightnvm/for-next'
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=326dbf4a27d8cc308a411b2ff2df615522915992;hp=f7041d31245d6d62b5e1c5ea7f28dd670c30d9c7;p=deliverable%2Flinux.git

Merge remote-tracking branch 'lightnvm/for-next'
---

diff --git a/drivers/lightnvm/Kconfig b/drivers/lightnvm/Kconfig
index 61c68a1f054a..2f5d5f4a4c75 100644
--- a/drivers/lightnvm/Kconfig
+++ b/drivers/lightnvm/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig NVM
 	bool "Open-Channel SSD target support"
-	depends on BLOCK
+	depends on BLOCK && HAS_DMA
 	help
 	  Say Y here to get to enable Open-channel SSDs.