aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/speakup/speakup_dectlk.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-01-02 02:37:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 14:06:31 -0800
commitca2beaf84d9678c12b17d92623f0e90829d6ca13 (patch)
treef9c5bdca38b24f7f39a8088ccd0bf6f6b20a2192 /drivers/staging/speakup/speakup_dectlk.c
parentstaging: et131x: Use register defines instead of magic numbers (diff)
downloadlinux-dev-ca2beaf84d9678c12b17d92623f0e90829d6ca13.tar.xz
linux-dev-ca2beaf84d9678c12b17d92623f0e90829d6ca13.zip
staging: speakup: Prefix externally-visible symbols
This prefixes all externally-visible symbols of speakup with "spk_". Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/speakup/speakup_dectlk.c')
-rw-r--r--drivers/staging/speakup/speakup_dectlk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
index daff3b9a4a6d..0dd2eb96cb28 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -134,7 +134,7 @@ static struct spk_synth synth_dectlk = {
.vars = vars,
.default_pitch = ap_defaults,
.default_vol = g5_defaults,
- .probe = serial_synth_probe,
+ .probe = spk_serial_synth_probe,
.release = spk_serial_release,
.synth_immediate = spk_synth_immediate,
.catch_up = do_catch_up,
@@ -214,8 +214,8 @@ static void do_catch_up(struct spk_synth *synth)
int jiffy_delta_val;
int delay_time_val;
- jiffy_delta = get_var(JIFFY);
- delay_time = get_var(DELAY);
+ jiffy_delta = spk_get_var(JIFFY);
+ delay_time = spk_get_var(DELAY);
spk_lock(flags);
jiffy_delta_val = jiffy_delta->u.n.value;
spk_unlock(flags);