UBUNTU: SAUCE: Revert "lightnvm: include NVM Express driver if OCSSD is selected...

BugLink: http://bugs.launchpad.net/bugs/1759893
This reverts commit 32c662c58a9b9d0c99e713a14ca323a9a91c73a0,
which adds a "select BLK_DEV_NVME" to NVM. This makes it
impossible to set CONFIG_BLK_DEV_NVME=m and breaks Mellanox OFED
with the inbox "nvme" driver. The dependency looks backwards to
me; the driver enabled by BLK_DEV_NVME calls into the support
supplied by CONFIG_NVME, not the other way around.

For now revert the commit which disallows building the driver as
a module, until this gets sorted out upstream.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/lightnvm/Kconfig b/drivers/lightnvm/Kconfig
index 2a953efec4e196b8bbac2203845954e2a3163fe6..ead61a93cb4eb78b3e005ac6833a90b898389a56 100644 (file)
--- a/drivers/lightnvm/Kconfig
+++ b/drivers/lightnvm/Kconfig
@@ -4,8 +4,7 @@
 
 menuconfig NVM
        bool "Open-Channel SSD target support"
-       depends on BLOCK && HAS_DMA && PCI
-       select BLK_DEV_NVME
+       depends on BLOCK && HAS_DMA
        help
          Say Y here to get to enable Open-channel SSDs.