X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2FMakefile;h=5a43c7d795942d1b478483e9464f1d58d471a15d;hb=cf7b7e0b3718418b38e1c20f5236534402e5a6c0;hp=3cfe7cebaa6ad3222eb3161367101b755dccd79d;hpb=6f35308c3ffa256bed183adf6f2c0c6c211ca487;p=~andy%2Flinux

diff --git a/block/Makefile b/block/Makefile
index 3cfe7cebaa6..5a43c7d7959 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,7 +2,9 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := 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 ioctl.o genhd.o scsi_ioctl.o
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
@@ -11,4 +13,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
 
 obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o
-obj-$(CONFIG_COMPAT)		+= compat_ioctl.o
+obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o