Merge tag 'amlogic-defconfig-for-v6.10' of https://git.kernel.org/pub/scm/linux/kerne...

Amlogic defconfig changes for v6.10:
- Enable Khadas TS050 driver as module

* tag 'amlogic-defconfig-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: defconfig: enable Khadas TS050 panel as module

Link: https://lore.kernel.org/r/13bf8bc4-1cb7-4b94-8c98-9d1cdae5e1f8@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index 24f325cef663fa1a8cafc1be1d0f3b35278c6e5a,76c687ae8b8999dc06c79596ec90d05243f42f3b..de3017d05ce7768a0b35b7a0ec543a015d4eeb63
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -871,8 -865,8 +871,9 @@@ CONFIG_DRM_PANEL_LVDS=
  CONFIG_DRM_PANEL_SIMPLE=m
  CONFIG_DRM_PANEL_EDP=m
  CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
+ CONFIG_DRM_PANEL_KHADAS_TS050=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