X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2FMakefile;h=0bb499a739cda2c5cf45f437fe521e592fbaf439;hb=cfca31ce789963c0dd6ca2e9cc13b90cc2802fbd;hp=75597c1263e0862314011b31fe03991ff121c537;hpb=a168ee84c90b39ece357da127ab388f2f64db19c;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/Makefile b/block/Makefile
index 75597c1..0bb499a 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,13 +2,16 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := elevator.o blk-core.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 blk-lib.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