summaryrefslogtreecommitdiffstats
path: root/drivers/block/Makefile
diff options
context:
space:
mode:
authorBart Van Assche <bart.vanassche@wdc.com>2018-07-23 14:18:33 -0700
committerJens Axboe <axboe@kernel.dk>2018-07-24 09:54:36 -0600
commit76f17d8ba1cbc3d2786955b2f15e071da93527cd (patch)
tree956f3240272574ab3a0e45125a3dee837f031cea /drivers/block/Makefile
parent8824f62246bef288173a6624a363352f0d4d3b09 (diff)
downloadop-kernel-dev-76f17d8ba1cbc3d2786955b2f15e071da93527cd.zip
op-kernel-dev-76f17d8ba1cbc3d2786955b2f15e071da93527cd.tar.gz
block: Rename the null_blk_mod kernel module back into null_blk
Commit ca4b2a011948 ("null_blk: add zone support") breaks several blktests scripts because it renamed the null_blk kernel module into null_blk_mod. Hence rename null_blk_mod back into null_blk. Fixes: ca4b2a011948 ("null_blk: add zone support") Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Matias Bjorling <matias.bjorling@wdc.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r--drivers/block/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a0d88aa..8566b18 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -38,9 +38,9 @@ obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/
obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
obj-$(CONFIG_ZRAM) += zram/
-obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk_mod.o
-null_blk_mod-objs := null_blk.o
-null_blk_mod-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
+obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o
+null_blk-objs := null_blk_main.o
+null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
skd-y := skd_main.o
swim_mod-y := swim.o swim_asm.o
OpenPOWER on IntegriCloud