summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/Makefile2
-rw-r--r--block/blk-flush.c (renamed from block/blk-barrier.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index 0bb499a739cd..f627e4b1a9da 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -3,7 +3,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-flush.o blk-settings.o blk-ioc.o blk-map.o \
blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o
diff --git a/block/blk-barrier.c b/block/blk-flush.c
index e8b2e5c091b1..e8b2e5c091b1 100644
--- a/block/blk-barrier.c
+++ b/block/blk-flush.c