[SRU][OEM-5.17][PATCH 10/10] UBUNTU: [Config]: enable SERIAL_MULTI_INSTANTIATE

[Hui Wang]

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

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.oem/abi/amd64/oem.modules       | 1 -
 debian.oem/config/annotations          | 5 ++++-
 debian.oem/config/config.common.ubuntu | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian.oem/abi/amd64/oem.modules b/debian.oem/abi/amd64/oem.modules
index 8670234465fb..266cfc8e9de4 100644
--- a/debian.oem/abi/amd64/oem.modules
+++ b/debian.oem/abi/amd64/oem.modules
@@ -2005,7 +2005,6 @@ i2c-ismt
 i2c-kempld
 i2c-matroxfb
 i2c-mlxcpld
-i2c-multi-instantiate
 i2c-mux
 i2c-mux-gpio
 i2c-mux-ltc4306
diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
index f6ca5be14bf7..ac9cbb2aa024 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/config/annotations
@@ -10437,7 +10437,7 @@ CONFIG_SONY_LAPTOP                              policy<{'amd64': 'm'}>
 CONFIG_SONYPI_COMPAT                            policy<{'amd64': 'y'}>
 CONFIG_SYSTEM76_ACPI                            policy<{'amd64': 'm'}>
 CONFIG_TOPSTAR_LAPTOP                           policy<{'amd64': 'm'}>
-CONFIG_I2C_MULTI_INSTANTIATE                    policy<{'amd64': 'm'}>
+CONFIG_SERIAL_MULTI_INSTANTIATE                 policy<{'amd64': 'm'}>
 CONFIG_MLX_PLATFORM                             policy<{'amd64': 'm'}>
 CONFIG_TOUCHSCREEN_DMI                          policy<{'amd64': 'y'}>
 CONFIG_INTEL_IPS                                policy<{'amd64': 'm'}>
@@ -10445,6 +10445,9 @@ CONFIG_INTEL_SCU_PCI                            policy<{'amd64': 'y'}>
 CONFIG_INTEL_SCU_PLATFORM                       policy<{'amd64': 'm'}>
 CONFIG_INTEL_SCU_IPC_UTIL                       policy<{'amd64': 'm'}>
 
+#
+CONFIG_SERIAL_MULTI_INSTANTIATE                 note<LP:1965496>
+
 # Menu: Device Drivers >> X86 Platform Specific Device Drivers >> Dell X86 Platform Specific Device Drivers
 CONFIG_X86_PLATFORM_DRIVERS_DELL                policy<{'amd64': 'y'}>
 CONFIG_ALIENWARE_WMI                            policy<{'amd64': 'm'}>
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index ff080aa2bcff..3b3cafb185fd 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -3239,7 +3239,6 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_KEMPLD=m
 CONFIG_I2C_MLXCPLD=m
-CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_LTC4306=m
@@ -7151,6 +7150,7 @@ CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_MAX310X=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_MEN_Z135=m
+CONFIG_SERIAL_MULTI_INSTANTIATE=m
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
-- 
2.25.1