diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-01-29 14:04:06 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-01-29 21:55:12 +0100 |
| commit | d6d48196961729b79509dcaeeb0f0fb4fbb47d29 (patch) | |
| tree | e80f5cdc7f0d682a46b816f5a489357f7d622d62 /block/Makefile | |
| parent | db1d08c646e47f3c7835ecdabb51a906ec311f69 (diff) | |
| download | linux-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.tar.gz linux-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.tar.bz2 linux-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.zip | |
block: ll_rw_blk.c split, add blk-merge.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/Makefile')
| -rw-r--r-- | block/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile index 2002046d0a9e..5a43c7d79594 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 |