projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.13/core' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
drivers
/
block
/
Kconfig
diff --git
a/drivers/block/Kconfig
b/drivers/block/Kconfig
index
e67fa16
..
5902bd0
100644
(file)
--- 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