aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-01-20 12:50:14 -0500
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 15:52:51 -0400
commitb60503ba432b16fc84442a84e29a7aad2c0c363d (patch)
tree43dca7cd57965ce1a2b7b6f94437f0364fbc0034 /drivers/block/Kconfig
parentXen: Export xen_biovec_phys_mergeable (diff)
downloadlinux-dev-b60503ba432b16fc84442a84e29a7aad2c0c363d.tar.xz
linux-dev-b60503ba432b16fc84442a84e29a7aad2c0c363d.zip
NVMe: New driver
This driver is for devices that follow the NVM Express standard Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 6f07ec1c2f58..35e56e1c948f 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -315,6 +315,17 @@ config BLK_DEV_NBD
If unsure, say N.
+config BLK_DEV_NVME
+ tristate "NVM Express block device"
+ depends on PCI
+ ---help---
+ The NVM Express driver is for solid state drives directly
+ connected to the PCI or PCI Express bus. If you know you
+ don't have one of these, it is safe to answer N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called nvme.
+
config BLK_DEV_OSD
tristate "OSD object-as-blkdev support"
depends on SCSI_OSD_ULD