[PATCH] UBUNTU: [Config] gcp: Disable CONFIG_DELL_SMBIOS_SMM, CONFIG_DELL_UART_BACKLIGHT, CONFIG_I2C_AMD_MP2

[Tim Gardner]

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

Enforcement annotations indicate that these config options should never have
been set.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules | 1 -
 debian.gcp/config/config.common.ubuntu         | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules b/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules
index a7cd5e6bf7ee..46c43d3d68e0 100644
--- a/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules
+++ b/debian.gcp/abi/5.8.0-1028.29/amd64/gcp.modules
@@ -959,7 +959,6 @@ dell-rbtn
 dell-smbios
 dell-smm-hwmon
 dell-smo8800
-dell-uart-backlight
 dell-wmi
 dell-wmi-aio
 dell-wmi-descriptor
diff --git a/debian.gcp/config/config.common.ubuntu b/debian.gcp/config/config.common.ubuntu
index ecf964926e6e..61c0a4a685a5 100644
--- a/debian.gcp/config/config.common.ubuntu
+++ b/debian.gcp/config/config.common.ubuntu
@@ -1669,10 +1669,10 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBTN=m
 CONFIG_DELL_RBU=m
 CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMBIOS_SMM=y
+# CONFIG_DELL_SMBIOS_SMM is not set
 CONFIG_DELL_SMBIOS_WMI=y
 CONFIG_DELL_SMO8800=m
-CONFIG_DELL_UART_BACKLIGHT=m
+# CONFIG_DELL_UART_BACKLIGHT is not set
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
@@ -3027,7 +3027,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
-CONFIG_I2C_AMD_MP2=y
+# CONFIG_I2C_AMD_MP2 is not set
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_CHARDEV=y
-- 
2.17.1