Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / block / Makefile

diff --git a/block/Makefile b/block/Makefile
index c850d5ef80a22eccd057d76c0d8acab6f5f4d953..0fec4b3fab511bc065261121f279e6f64038c35c 100644 (file)
--- 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