aboutsummaryrefslogtreecommitdiffstats
path: root/block/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'block/Makefile')
-rw-r--r--block/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index 2002046d0a9..5a43c7d7959 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \
- blk-exec.o ioctl.o genhd.o scsi_ioctl.o
+ blk-exec.o blk-merge.o ioctl.o genhd.o scsi_ioctl.o
obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o