diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-26 21:36:54 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-26 21:52:58 -0500 |
| commit | 4d82e9db422ec34793650a34c5f03edd7b0abbaf (patch) | |
| tree | 59a8eda6e6f11f6226c5910c6f41695b964ca03e /drivers/scsi/ufs/Kconfig | |
| parent | 18c05faf8ab14913c8144108661efa8f17b10b5b (diff) | |
| parent | aa2c24e7f415e9c13635cee22ff4e15a80215551 (diff) | |
| download | lwn-4d82e9db422ec34793650a34c5f03edd7b0abbaf.tar.gz lwn-4d82e9db422ec34793650a34c5f03edd7b0abbaf.zip | |
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue
The UFS core has received a substantial rework this cycle. This in
turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes
into 5.12/scsi-queue and resolve the conflict.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ufs/Kconfig')
| -rw-r--r-- | drivers/scsi/ufs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index d0d7ead99eaa..07cf415367b4 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -72,6 +72,7 @@ config SCSI_UFS_DWC_TC_PCI config SCSI_UFSHCD_PLATFORM tristate "Platform bus based UFS Controller support" depends on SCSI_UFSHCD + depends on HAS_IOMEM help This selects the UFS host controller support. Select this if you have an UFS controller on Platform bus. |