diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-02-21 11:53:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-02-21 11:53:51 +0100 |
commit | 6255b48aebfd4dff375e97fc8b075a235848db0b (patch) | |
tree | bcedf2b959a843a18cf7ebcc9120a0dd1c4e234f /drivers/accessibility/speakup/speakup_dectlk.c | |
parent | arm64: Support PREEMPT_DYNAMIC (diff) | |
parent | Linux 5.17-rc5 (diff) | |
download | linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.tar.xz linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.zip |
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
New conflicts in sched/core due to the following upstream fixes:
44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled")
Conflicts:
include/linux/psi_types.h
kernel/sched/psi.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | drivers/accessibility/speakup/speakup_dectlk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/accessibility/speakup/speakup_dectlk.c b/drivers/accessibility/speakup/speakup_dectlk.c index 580ec796816b..78ca4987e619 100644 --- a/drivers/accessibility/speakup/speakup_dectlk.c +++ b/drivers/accessibility/speakup/speakup_dectlk.c @@ -44,6 +44,7 @@ static struct var_t vars[] = { { CAPS_START, .u.s = {"[:dv ap 160] " } }, { CAPS_STOP, .u.s = {"[:dv ap 100 ] " } }, { RATE, .u.n = {"[:ra %d] ", 180, 75, 650, 0, 0, NULL } }, + { PITCH, .u.n = {"[:dv ap %d] ", 122, 50, 350, 0, 0, NULL } }, { INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } }, { VOL, .u.n = {"[:dv g5 %d] ", 86, 60, 86, 0, 0, NULL } }, { PUNCT, .u.n = {"[:pu %c] ", 0, 0, 2, 0, 0, "nsa" } }, |