block: make scsi_request and scsi ioctl support optional

[mirror_ubuntu-artful-kernel.git] / block / Makefile

diff --git a/block/Makefile b/block/Makefile
index 317165f8708c8789c7c178bfae1be5c5e0a3d174..38f26cae43034f3d269c3b6b900b7ced6ad53147 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -7,10 +7,11 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
                        blk-exec.o blk-merge.o blk-softirq.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 scsi_ioctl.o partition-generic.o ioprio.o \
+                       genhd.o partition-generic.o ioprio.o \
                        badblocks.o partitions/
 
-obj-$(CONFIG_BOUNCE)   += bounce.o
+obj-$(CONFIG_BOUNCE)           += bounce.o
+obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o
 obj-$(CONFIG_BLK_DEV_BSG)      += bsg.o
 obj-$(CONFIG_BLK_DEV_BSGLIB)   += bsg-lib.o
 obj-$(CONFIG_BLK_CGROUP)       += blk-cgroup.o