UBUNTU: [Config] updateconfigs following v5.15-rc3 rebase

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2eecbc4a6290c335dd0aef0ea2576742ac08afd..33ccded5f70b3ed2f52b185e8d21960c339713c7 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5763,7 +5763,6 @@ CONFIG_NVMEM_IMX_IIM                            policy<{'arm64': 'm', 'armhf-gen
 CONFIG_NVMEM_IMX_OCOTP                          policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_NVMEM_IMX_OCOTP_SCU                      policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_MTK_EFUSE                                policy<{'arm64': 'n', 'armhf': 'n'}>
-CONFIG_NVMEM_NINTENDO_OTP                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_QCOM_QFPROM                              policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_NVMEM_SPMI_SDAM                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_ROCKCHIP_EFUSE                           policy<{'arm64': 'm', 'armhf': 'm'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8c484331badb21614b06d675c2908e2b57a6ca64..6d67c05707b4e9e53be2d2ec846c0556c6f7aa22 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7326,7 +7326,6 @@ CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=m
-CONFIG_NVMEM_NINTENDO_OTP=m
 CONFIG_NVMEM_REBOOT_MODE=m
 CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_SNVS_LPGPR=m