From: Keith Busch <keith.busch@intel.com>
Date: Mon, 12 Oct 2015 17:37:38 +0000 (-0600)
Subject: NVMe: Add explicit block config dependency
X-Git-Tag: v4.1.12-92~126^2~226
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cfcc32e8419d93cab166562fe9405e0dd4d967cc;p=users%2Fjedix%2Flinux-maple.git

NVMe: Add explicit block config dependency

The nvme driver was moved from drivers/block, losing our implicit
dependency on CONFIG_BLOCK. This makes it an explicit driver dependency.

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 11feb18f4edb1423ed6091908c45de7ade30d5b7)

Orabug: 22620486
Signed-off-by: Jason Luo <zhangqing.luo@oracle.com>
---

diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
index 0089f78b40718..002a94abdbc45 100644
--- a/drivers/nvme/host/Kconfig
+++ b/drivers/nvme/host/Kconfig
@@ -1,6 +1,6 @@
 config BLK_DEV_NVME
 	tristate "NVM Express block device"
-	depends on PCI
+	depends on PCI && BLOCK
 	---help---
 	  The NVM Express driver is for solid state drives directly
 	  connected to the PCI or PCI Express bus.  If you know you