X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2FMakefile;h=5a43c7d795942d1b478483e9464f1d58d471a15d;hb=a2a395256134a24d906d5e67e03e853c580b37ed;hp=2002046d0a9e94830cd6426ece883844e6a0f477;hpb=86db1e29772372155db08ff48a9ceb76e11a2ad1;p=linux-2.6-omap-h63xx.git

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