diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-20 07:40:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-20 07:40:19 +0200 |
| commit | cf8fb9f608def942d2d75c6180bf886b197fa666 (patch) | |
| tree | d614e499629dc78186b458093af9edacdaae0e6c /kernel-armv7hl-lpae.config | |
| parent | f7439742fcc7d1d1c529fd21ce1316bf03ec079b (diff) | |
| parent | 61efc9cd0790f36b94d91c272b1f2c5562141faf (diff) | |
| download | kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.tar.gz kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.tar.xz kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-armv7hl-lpae.config')
| -rw-r--r-- | kernel-armv7hl-lpae.config | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0fba79caf..f551319c9 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4216,6 +4216,7 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set +CONFIG_PHY_QCOM_UFS=m # CONFIG_PHY_QCOM_USB_HSIC is not set # CONFIG_PHY_QCOM_USB_HS is not set CONFIG_PHY_ROCKCHIP_DP=m @@ -4926,9 +4927,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_UFS_DWC_TC_PCI is not set +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFSHCD_PLATFORM is not set +CONFIG_SCSI_UFSHCD_PLATFORM=m +CONFIG_SCSI_UFS_QCOM=m CONFIG_SCSI_VIRTIO=m CONFIG_SCSI_WD719X=m CONFIG_SCSI=y @@ -6076,7 +6079,7 @@ CONFIG_UCSI=m CONFIG_UDF_FS=m # CONFIG_UEVENT_HELPER is not set # CONFIG_UFS_DEBUG is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set CONFIG_UHID=m CONFIG_UIO_AEC=m |