From aaf3b7d6315794168b42f22f830b34a7de75b53c Mon Sep 17 00:00:00 2001
From: Paolo Pisati <paolo.pisati@canonical.com>
Date: Mon, 4 Jan 2021 16:49:22 +0100
Subject: [PATCH] UBUNTU: [Config] updateconfigs following v5.10.4 import

BugLink: https://bugs.launchpad.net/bugs/1910111

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 414435103bc50..c03c77e33d52e 100644
--- 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
index 1a5d76a513c50..f71ebcc3a2f14 100644
--- 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
index a8809ae233dfa..657c2c788c54f 100644
--- 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
index 082b46896daa8..1130db57b3338 100644
--- 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
index da599111737ee..73a1176efeebc 100644
--- 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
index 0c944042b126c..fc2d421b86ff0 100644
--- 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