diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 21:34:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 21:34:09 +0100 |
| commit | 92b5abbb44e05cdbc4483219f30a435dd871a8ea (patch) | |
| tree | 15490d1c7fd415575ec6beec1baa5ce89f747bf9 /drivers/block/Kconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | NVMe: Set number of queues correctly (diff) | |
| download | linux-92b5abbb44e05cdbc4483219f30a435dd871a8ea.tar.xz linux-92b5abbb44e05cdbc4483219f30a435dd871a8ea.zip | |
Merge git://git.infradead.org/users/willy/linux-nvme
* git://git.infradead.org/users/willy/linux-nvme: (105 commits)
NVMe: Set number of queues correctly
NVMe: Version 0.8
NVMe: Set queue flags correctly
NVMe: Simplify nvme_unmap_user_pages
NVMe: Mark the end of the sg list
NVMe: Fix DMA mapping for admin commands
NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT
NVMe: Merge the nvme_bio and nvme_prp data structures
NVMe: Change nvme_completion_fn to take a dev
NVMe: Change get_nvmeq to take a dev instead of a namespace
NVMe: Simplify completion handling
NVMe: Update Identify Controller data structure
NVMe: Implement doorbell stride capability
NVMe: Version 0.7
NVMe: Don't probe namespace 0
Fix calculation of number of pages in a PRP List
NVMe: Create nvme_identify and nvme_get_features functions
NVMe: Fix memory leak in nvme_dev_add()
NVMe: Fix calls to dma_unmap_sg
NVMe: Correct sg list setup in nvme_map_user_pages
...
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index a30aa103f95b..4e4c8a4a5fd3 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -317,6 +317,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 |