X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=block%2FMakefile;h=959feeb253be99a8cceb92220f0a9f0253bcf7ca;hb=264a0472183ce7ad05eea3360f5907880a1e5e78;hp=7e4f93e2b44e9a87503a90bce18c246245cd040a;hpb=8006fdd6dc387abaa4b683bda4868c879fd76070;p=linux-2.6-omap-h63xx.git

diff --git a/block/Makefile b/block/Makefile
index 7e4f93e2b44..959feeb253b 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,9 +2,12 @@
 # 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_BLK_DEV_BSG)	+= bsg.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