diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 10:38:59 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 10:39:08 +0300 |
| commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
| tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /drivers/scsi/qedf | |
| parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
| parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
| download | linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.xz | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/scsi/qedf')
| -rw-r--r-- | drivers/scsi/qedf/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/scsi/qedf/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/qedf/Kconfig b/drivers/scsi/qedf/Kconfig index 943f5ee45807..7cd993be4e57 100644 --- a/drivers/scsi/qedf/Kconfig +++ b/drivers/scsi/qedf/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config QEDF tristate "QLogic QEDF 25/40/100Gb FCoE Initiator Driver Support" depends on PCI && SCSI diff --git a/drivers/scsi/qedf/Makefile b/drivers/scsi/qedf/Makefile index 414f2a772a5f..c46287826fb8 100644 --- a/drivers/scsi/qedf/Makefile +++ b/drivers/scsi/qedf/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_QEDF) := qedf.o qedf-y = qedf_dbg.o qedf_main.o qedf_io.o qedf_fip.o \ qedf_attr.o qedf_els.o drv_scsi_fw_funcs.o drv_fcoe_fw_funcs.o |