summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-09-11 23:41:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-11 23:41:49 +0200
commitbd0b841fee49de421f615cc173ccff063303672f (patch)
tree0cdea10cb81bf3f5e7e1f68a74ff629260903caa /drivers
parentMerge tag 'staging-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-bd0b841fee49de421f615cc173ccff063303672f.tar.xz
linux-bd0b841fee49de421f615cc173ccff063303672f.zip
nvme: make NVME_RDMA depend on BLOCK
Commit aa71987472a9 ("nvme: fabrics drivers don't need the nvme-pci driver") removed the dependency on BLK_DEV_NVME, but the cdoe does depend on the block layer (which used to be an implicit dependency through BLK_DEV_NVME). Otherwise you get various errors from the kbuild test robot random config testing when that happens to hit a configuration with BLOCK device support disabled. Cc: Christoph Hellwig <hch@lst.de> Cc: Jay Freyensee <james_p_freyensee@linux.intel.com> Cc: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvme/host/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
index 0c644f7bdf80..f7d37a62f874 100644
--- a/drivers/nvme/host/Kconfig
+++ b/drivers/nvme/host/Kconfig
@@ -30,7 +30,7 @@ config NVME_FABRICS
config NVME_RDMA
tristate "NVM Express over Fabrics RDMA host driver"
- depends on INFINIBAND
+ depends on INFINIBAND && BLOCK
select NVME_CORE
select NVME_FABRICS
select SG_POOL