Skip to content

Commit 4260ab2

Browse files
committed
Merge branch 'arm64-defconfig-for-6.10' onto 'v6.9-rc1'
Merge the patches that was picked up for v6.10 before v6.9-rc1 became available onto v6.9-rc1 to reduce the risk for conflicts etc.
2 parents 4cece76 + cf30987 commit 4260ab2

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
866866
CONFIG_DRM_PANEL_EDP=m
867867
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
868868
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
869+
CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
869870
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
870871
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
871872
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@ -1473,6 +1474,7 @@ CONFIG_PWM_VISCONTI=m
14731474
CONFIG_SL28CPLD_INTC=y
14741475
CONFIG_QCOM_PDC=y
14751476
CONFIG_QCOM_MPM=y
1477+
CONFIG_RESET_GPIO=m
14761478
CONFIG_RESET_IMX7=y
14771479
CONFIG_RESET_QCOM_AOSS=y
14781480
CONFIG_RESET_QCOM_PDC=m

0 commit comments

Comments
 (0)