1 files changed, 2 insertions, 2 deletions
diff --git a/block/Makefile b/block/Makefile
index 0da976ce67dd..bfe73049f939 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -4,8 +4,8 @@
 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 ioctl.o genhd.o \
+                        blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
-                        scsi_ioctl.o cmd-filter.o
+                        ioctl.o genhd.o scsi_ioctl.o cmd-filter.o
 obj-$(CONFIG_BLK_DEV_BSG)       += bsg.o
 obj-$(CONFIG_IOSCHED_NOOP)      += noop-iosched.o

diff --git a/block/Makefile b/block/Makefile index 0da976ce67dd..bfe73049f939 100644 --- a/block/Makefile +++ b/block/Makefile
@@ -4,8 +4,8 @@
4		4
5	obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \	5	obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
6	blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \	6	blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \
7	blk-exec.o blk-merge.o blk-softirq.o ioctl.o genhd.o \	7	blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
8	scsi_ioctl.o cmd-filter.o	8	ioctl.o genhd.o scsi_ioctl.o cmd-filter.o
9		9
10	obj-$(CONFIG_BLK_DEV_BSG) += bsg.o	10	obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
11	obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o	11	obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o