Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

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

diff --git a/block/Makefile b/block/Makefile
index c05de0e0037fe6f14f9e6f508bece1271568bb36..959feeb253be99a8cceb92220f0a9f0253bcf7ca 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,8 +2,9 @@
 # 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