From ba6b167af6ee5e63ca79ad22e7719644aed12b2c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 18 May 2024 20:50:40 +0200
Subject: Merging debian version 6.8.9-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/config/armhf/config | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'debian/config/armhf')

diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 4ece0c6129..5c5d68944b 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -2,9 +2,6 @@
 ## file: arch/arm/Kconfig
 ##
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_VIRT=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
 CONFIG_ARM_ERRATA_754327=y
@@ -34,6 +31,13 @@ CONFIG_KERNEL_MODE_NEON=y
 #. DEBUG_LL is incompatible with multiplatform
 # CONFIG_DEBUG_LL is not set
 
+##
+## file: arch/arm/Kconfig.platforms
+##
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_VIRT=y
+
 ##
 ## file: arch/arm/crypto/Kconfig
 ##
@@ -555,6 +559,7 @@ CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_PWM_FAN=m
 
 ##
@@ -729,6 +734,7 @@ CONFIG_MEDIA_CONTROLLER=y
 ## file: drivers/media/cec/platform/Kconfig
 ##
 CONFIG_CEC_STM32=m
+CONFIG_CEC_TEGRA=m
 
 ##
 ## file: drivers/media/platform/Kconfig
@@ -741,7 +747,7 @@ CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_ASPEED=m
 
 ##
-## file: drivers/media/platform/chips-media/Kconfig
+## file: drivers/media/platform/chips-media/coda/Kconfig
 ##
 CONFIG_VIDEO_CODA=m
 
@@ -1079,6 +1085,12 @@ CONFIG_ADIN_PHY=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 
+##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
+##
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+
 ##
 ## file: drivers/net/wireless/ti/Kconfig
 ##
@@ -1255,6 +1267,7 @@ CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24735=m
 
 ##
 ## file: drivers/pwm/Kconfig
@@ -1612,7 +1625,6 @@ CONFIG_BACKLIGHT_GPIO=m
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB_ARMCLCD=y
 CONFIG_FB_EFI=y
 CONFIG_FB_VT8500=y
 CONFIG_FB_WM8505=y
@@ -1704,6 +1716,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 ##
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_SPDIF=y
+CONFIG_SND_SOC_WM8804_I2C=m
 
 ##
 ## file: sound/soc/fsl/Kconfig
-- 
cgit v1.2.3