Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/block/Makefile b/block/Makefile
index 7e4f93e2b44e9a87503a90bce18c246245cd040a..4b84d0d5947bc22cf8a94f91fb7c556b29ff571c 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,9 +2,11 @@
 # Makefile for the kernel block layer
 #
 
-obj-y  := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
+obj-$(CONFIG_BLOCK) := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
 
 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