summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-lpae-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-18 04:40:59 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-18 04:40:59 +0100
commita69ff84e6eb036e0f274cbb14c5b71546e4af21e (patch)
treecb23a9e1e8922fa544d544bbf708ae53fd4685e5 /kernel-armv7hl-lpae-debug-fedora.config
parentaed4b39bbc1b324564fab1dbf58b5b9d501d4a0f (diff)
parentb30e1518d13b169ed5d359d585387f755ee3ea2f (diff)
downloadkernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.tar.gz
kernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.tar.xz
kernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-armv7hl-lpae-debug-fedora.config')
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 7c77997a5..771b321f4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4602,7 +4602,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
CONFIG_PHY_QCOM_UFS=m
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4856,6 +4856,7 @@ CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_RMTFS_MEM=m
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
CONFIG_QCOM_SOCINFO=m
CONFIG_QCOM_SPMI_ADC5=m
CONFIG_QCS_GCC_404=m
@@ -6231,7 +6232,6 @@ CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SOUNDWIRE_CADENCE=m
# CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPEAKUP is not set
@@ -7006,7 +7006,6 @@ CONFIG_USB_MICROTEK=m
# CONFIG_USB_MIDI_GADGET is not set
CONFIG_USB_MON=y
CONFIG_USB_MR800=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
CONFIG_USB_MUSB_AM35X=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -7308,7 +7307,7 @@ CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
CONFIG_VIDEO_ROCKCHIP_RGA=m
CONFIG_VIDEO_S5P_FIMC=m
CONFIG_VIDEO_S5P_MIPI_CSIS=m