---

yaml --- r: 213178 b: refs/heads/master c: 8839a0e h: refs/heads/master v: v3
git-mirror · Sep 10, 2010 · 53a2bd8 · 53a2bd8
1 parent 17e4463
commit 53a2bd8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28e7d1845216538303bb95d679d8fd4de50e2f1a
+refs/heads/master: 8839a0e055d9abd6c011d533373a8dd266cad011
diff --git a/trunk/block/Makefile b/trunk/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/trunk/block/blk-barrier.c → trunk/block/blk-flush.c b/trunk/block/blk-barrier.c → trunk/block/blk-flush.c