UBUNTU: [Config] updateconfigs following v5.10.4 import

BugLink: https://bugs.launchpad.net/bugs/1910111 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
mariux64 · Jan 4, 2021 · aaf3b7d · aaf3b7d
1 parent 8a1981d
commit aaf3b7d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 5 deletions.
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
@@ -344,7 +344,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
@@ -360,7 +360,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
@@ -347,7 +347,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
@@ -5879,6 +5879,7 @@ CONFIG_MFD_ROHM_BD718XX=m
 CONFIG_MFD_SC27XX_PMIC=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SIMPLE_MFD_I2C=m
+CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMFX=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
@@ -349,7 +349,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
@@ -329,7 +329,6 @@ CONFIG_MEM_SOFT_DIRTY=y
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SL28CPLD is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set