diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-07-31 12:51:48 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-02 15:19:48 -0600 |
| commit | ad80f9703a3de62c48c012af62899b754af087f1 (patch) | |
| tree | 0148cda759ac22d62f1c1d3bd70b7f98db803e4a | |
| parent | 1fd89e4ddcec0c8cae15ddd19980cb944b2baf5d (diff) | |
| download | linux-0-day-ad80f9703a3de62c48c012af62899b754af087f1.tar.gz linux-0-day-ad80f9703a3de62c48c012af62899b754af087f1.tar.xz | |
scsi: build scsi_common.o for all scsi passthrough request users
Split scsi_common.o out of SCSI so that non-SCSI users can pull it in
easily for future sense buffer helper usage.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/scsi/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 24cd470146578..a6abd7a856c63 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -76,7 +76,7 @@ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/ obj-$(CONFIG_NUBUS) += nubus/ obj-y += macintosh/ obj-$(CONFIG_IDE) += ide/ -obj-$(CONFIG_SCSI) += scsi/ +obj-y += scsi/ obj-y += nvme/ obj-$(CONFIG_ATA) += ata/ obj-$(CONFIG_TARGET_CORE) += target/ diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 80aca24563534..768953881c9e9 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -21,6 +21,7 @@ CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_SCSI) += scsi_mod.o +obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_common.o obj-$(CONFIG_RAID_ATTRS) += raid_class.o @@ -156,7 +157,6 @@ obj-$(CONFIG_SCSI_HISI_SAS) += hisi_sas/ obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o scsi_mod-y += scsi.o hosts.o scsi_ioctl.o \ scsicam.o scsi_error.o scsi_lib.o -scsi_mod-y += scsi_common.o scsi_mod-$(CONFIG_SCSI_CONSTANTS) += constants.o scsi_mod-$(CONFIG_SCSI_DMA) += scsi_lib_dma.o scsi_mod-y += scsi_scan.o scsi_sysfs.o scsi_devinfo.o |