diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-03-27 12:27:34 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-04-03 17:38:39 -0700 |
| commit | 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 (patch) | |
| tree | 9ab4f369e72a6f1953f53269030bbba047c6be8a /drivers/scsi/Makefile | |
| parent | ad448378825f5746c5fa37718724bc8f4e7b6945 (diff) | |
| parent | 3f6c9be27ae1932410d0af044b074fd2c27945c4 (diff) | |
| download | linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.gz linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.tar.bz2 linux-2e1f44f6ad8008be353c7c99286f7a747b4b3cf4.zip | |
Merge branch 'fixes' into misc
Somewhat nasty merge due to conflicts between "33b28357dd00 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc
scsi: qla2xxx: Fix FC-NVMe LUN discovery"
Merge is non-trivial and has been verified by Qlogic (Cavium)
Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index d5135efbf9cd..e29f9b8fd66d 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -180,7 +180,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) zalon7xx-objs := zalon.o ncr53c8xx.o NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o -oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o # Files generated that shall be removed upon make clean clean-files := 53c700_d.h 53c700_u.h |