diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 12:20:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 12:20:40 +0200 |
| commit | e8014d83f60479d3981baeaa3a21c993ff832f3f (patch) | |
| tree | 90af78aea1a518c4c04d123e1473e8c4c729c221 /drivers/scsi/hisi_sas/Kconfig | |
| parent | Staging: rtl8188eu: core: rtw_pwrctrl: fixed a coding style issue (diff) | |
| parent | Linux 5.7-rc3 (diff) | |
| download | linux-e8014d83f60479d3981baeaa3a21c993ff832f3f.tar.xz linux-e8014d83f60479d3981baeaa3a21c993ff832f3f.zip | |
Merge 5.7-rc3 into staging-next
We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/hisi_sas/Kconfig')
| -rw-r--r-- | drivers/scsi/hisi_sas/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/hisi_sas/Kconfig b/drivers/scsi/hisi_sas/Kconfig index 90a17452a50d..13ed9073fc72 100644 --- a/drivers/scsi/hisi_sas/Kconfig +++ b/drivers/scsi/hisi_sas/Kconfig @@ -6,6 +6,7 @@ config SCSI_HISI_SAS select SCSI_SAS_LIBSAS select BLK_DEV_INTEGRITY depends on ATA + select SATA_HOST help This driver supports HiSilicon's SAS HBA, including support based on platform device |