Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / block / Makefile

diff --git a/block/Makefile b/block/Makefile
index 7e4f93e..39b76ba 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,9 +2,19 @@
 # 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 blk-core.o blk-tag.o blk-sysfs.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 \
+                       partition-generic.o partitions/
 
+obj-$(CONFIG_BLK_DEV_BSG)      += bsg.o
+obj-$(CONFIG_BLK_DEV_BSGLIB)   += bsg-lib.o
+obj-$(CONFIG_BLK_CGROUP)       += blk-cgroup.o
+obj-$(CONFIG_BLK_DEV_THROTTLING)       += blk-throttle.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_BLOCK_COMPAT)     += compat_ioctl.o
+obj-$(CONFIG_BLK_DEV_INTEGRITY)        += blk-integrity.o