[PATCH][Hirsute/linux] UBUNTU: [Config] CONFIG_SPEAKUP=m

[Tim Gardner]

In order to enable the SPEAKUP accessibility modules, CONFIG_ACCESSIBILITY
must be set to 'y'.

CONFIG_SPEAKUP was enabled (as a module) on 5.8 and earlier kernels. It
moved from drivers/staging/ to drivers/accessibility/ between 5.8 and 5.11,
which would explain how it ended up being disabled on 5.11 and later.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/annotations          |  6 ++++--
 debian.master/config/config.common.ubuntu | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 892413decddb..2e319540e46e 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -520,9 +520,11 @@ CONFIG_UNISYS_VISORBUS                          policy<{'amd64': 'm'}>
 CONFIG_IDE                                      policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 
 # Menu: Device Drivers >> Accessibility support
-CONFIG_ACCESSIBILITY                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_ACCESSIBILITY                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_SPEAKUP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 #
-CONFIG_ACCESSIBILITY                            flag<REVIEW>
+CONFIG_ACCESSIBILITY                            mark<ENFORCED> note<LP: #1942459>
+CONFIG_SPEAKUP                                  mark<ENFORCED> note<LP: #1942459>
 
 # Menu: Device Drivers >> Accessibility support >> Speakup console speech
 
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2bd6818df676..cb270bad03a4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -33,11 +33,12 @@ CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_AAEON_IWMI_WDT=m
 CONFIG_AB3100_CORE=y
 CONFIG_AB3100_OTP=m
 CONFIG_ABP060MG=m
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ACERHDF=m
@@ -10277,6 +10278,18 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_AMD=m
 CONFIG_SPI_ARMADA_3700=m
-- 
2.33.0