diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2024-03-28 08:57:27 -0500 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2024-03-28 08:57:27 -0500 |
| commit | 4260ab2c8d474cf58e80c0398b562df93d58413a (patch) | |
| tree | 009dad8981120ed09d534357c7db97ab42ebc6a5 /arch/arm64/configs | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| parent | cf30987a9ae9a8a430f957f8516b2092f6bab29d (diff) | |
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.
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2c30d617e180..6c45a465a071 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -866,6 +866,7 @@ CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ILITEK_ILI9882T=m CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m +CONFIG_DRM_PANEL_NOVATEK_NT36672E=m CONFIG_DRM_PANEL_RAYDIUM_RM67191=m CONFIG_DRM_PANEL_SITRONIX_ST7703=m CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m @@ -1473,6 +1474,7 @@ CONFIG_PWM_VISCONTI=m CONFIG_SL28CPLD_INTC=y CONFIG_QCOM_PDC=y CONFIG_QCOM_MPM=y +CONFIG_RESET_GPIO=m CONFIG_RESET_IMX7=y CONFIG_RESET_QCOM_AOSS=y CONFIG_RESET_QCOM_PDC=m |