X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2FMakefile;h=cb2d515ebd6e7994ec76cb96436f291c243340d8;hb=9f5596af44514f99e3a654a4f7cb813354b9e516;hp=fcaae4ae67046c6e8f391acda92f186aef9b6a01;hpb=8324aa91d1e11a1fc25f209687a0b2e6c2ed47d0;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/Makefile b/block/Makefile
index fcaae4a..cb2d515 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,14 +2,16 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o ioctl.o \
-			genhd.o scsi_ioctl.o
+obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
+			blk-barrier.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 ioctl.o genhd.o scsi_ioctl.o
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
+obj-$(CONFIG_BLK_CGROUP)	+= blk-cgroup.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
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
+obj-$(CONFIG_BLK_DEV_INTEGRITY)	+= blk-integrity.o