diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 12:48:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 12:48:41 -0800 |
| commit | 16008d641670571ff4cd750b416c7caf2d89f467 (patch) | |
| tree | 6dc32821bd4576106cee50d52a90a8106a9d481f /drivers/block/Kconfig | |
| parent | b3c9dd182ed3bdcdaf0e42625a35924b0497afdc (diff) | |
| parent | 85a0f7b220777cd3c232fd2f079db5c4a874c4ee (diff) | |
| download | linux-3.10-16008d641670571ff4cd750b416c7caf2d89f467.tar.gz linux-3.10-16008d641670571ff4cd750b416c7caf2d89f467.tar.bz2 linux-3.10-16008d641670571ff4cd750b416c7caf2d89f467.zip | |
Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block
* 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
mtip32xx: do rebuild monitoring asynchronously
xen-blkfront: Use kcalloc instead of kzalloc to allocate array
mtip32xx: uninitialized variable in mtip_quiesce_io()
mtip32xx: updates based on feedback
xen-blkback: convert hole punching to discard request on loop devices
xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
xen/blk[front|back]: Enhance discard support with secure erasing support.
xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
mtip32xx: update to new ->make_request() API
mtip32xx: add module.h include to avoid conflict with moduleh tree
mtip32xx: mark a few more items static
mtip32xx: ensure that all local functions are static
mtip32xx: cleanup compat ioctl handling
mtip32xx: fix warnings/errors on 32-bit compiles
block: Add driver for Micron RealSSD pcie flash cards
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 6f07ec1c2f5..a30aa103f95 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -116,6 +116,8 @@ config PARIDE source "drivers/block/paride/Kconfig" +source "drivers/block/mtip32xx/Kconfig" + config BLK_CPQ_DA tristate "Compaq SMART2 support" depends on PCI && VIRT_TO_BUS |