blk-mq: merge blk-softirq.c into blk-mq.c

[sfrench/cifs-2.6.git] / block / Makefile

diff --git a/block/Makefile b/block/Makefile
index 78719169fb2af897242be4b0ca714ce98a6786ca..8d841f5f986fe4fb673a3ccfd81ed79fcc325a7a 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -5,7 +5,7 @@
 
 obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \
                        blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
-                       blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
+                       blk-exec.o blk-merge.o blk-timeout.o \
                        blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
                        blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \
                        genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o