summaryrefslogtreecommitdiff
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-11-08 09:08:12 -0700
committerJens Axboe <axboe@kernel.dk>2013-11-08 09:08:12 -0700
commite37459b8e2c7db6735e39e019e448b76e5e77647 (patch)
treea3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b /drivers/block/Kconfig
parentc7d1ba417c7cb7297d14dd47a390ec90ce548d5c (diff)
parente7e245000110a7794de8f925b9edc06a9c852f80 (diff)
downloadlinux-e37459b8e2c7db6735e39e019e448b76e5e77647.tar.gz
linux-e37459b8e2c7db6735e39e019e448b76e5e77647.tar.xz
Merge branch 'blk-mq/core' into for-3.13/core
Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/blk-timeout.c
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e07a5fd58ad7..4682546c5da7 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -15,6 +15,9 @@ menuconfig BLK_DEV
if BLK_DEV
+config BLK_DEV_NULL_BLK
+ tristate "Null test block driver"
+
config BLK_DEV_FD
tristate "Normal floppy disk support"
depends on ARCH_MAY_HAVE_PC_FDC