X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2FMakefile;h=cb2d515ebd6e7994ec76cb96436f291c243340d8;hb=fe0b393f2c0a0d23a9bc9ed7dc51a1ee511098bd;hp=c05de0e0037fe6f14f9e6f508bece1271568bb36;hpb=2056a782f8e7e65fd4bfd027506b4ce1c5e9ccd4;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/Makefile b/block/Makefile
index c05de0e..cb2d515 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,11 +2,16 @@
 # 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-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