Merge tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux

[linux-2.6-microblaze.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ecceaaa..2623269 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -16,13 +16,7 @@ menuconfig BLK_DEV
 
 if BLK_DEV
 
-config BLK_DEV_NULL_BLK
-       tristate "Null test block driver"
-       select CONFIGFS_FS
-
-config BLK_DEV_NULL_BLK_FAULT_INJECTION
-       bool "Support fault injection for Null test block driver"
-       depends on BLK_DEV_NULL_BLK && FAULT_INJECTION
+source "drivers/block/null_blk/Kconfig"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"