Merge nommu tree

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

diff --git a/block/Makefile b/block/Makefile
index 7e4f93e2b44e9a87503a90bce18c246245cd040a..c05de0e0037fe6f14f9e6f508bece1271568bb36 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -8,3 +8,5 @@ obj-$(CONFIG_IOSCHED_NOOP)      += noop-iosched.o
 obj-$(CONFIG_IOSCHED_AS)       += as-iosched.o
 obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)      += cfq-iosched.o
+
+obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o