From d6d48196961729b79509dcaeeb0f0fb4fbb47d29 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 29 Jan 2008 14:04:06 +0100 Subject: block: ll_rw_blk.c split, add blk-merge.c Signed-off-by: Jens Axboe --- block/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'block/Makefile') 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 -- cgit v1.2.3