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 0089f78b40718f37ed7c0bcee942a3023c9843c4..002a94abdbc45c7f20255b804efae684185283c9 100644 (file)
--- 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