Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / staging / speakup / speakup_audptr.c

diff --git a/drivers/staging/speakup/speakup_audptr.c b/drivers/staging/speakup/speakup_audptr.c
index a194b6f2b5aad68cc346f65250de2c0f90120ee8..94e509992c8b3e9e8bdd76fb7896e7f48afe9149 100644 (file)
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -34,14 +34,14 @@ static int synth_probe(struct spk_synth *synth);
 static void synth_flush(struct spk_synth *synth);
 
 static struct var_t vars[] = {
-       { CAPS_START, .u.s = {"\x05[f99]" }},
-       { CAPS_STOP, .u.s = {"\x05[f80]" }},
-       { RATE, .u.n = {"\x05[r%d]", 10, 0, 20, 100, -10, NULL }},
-       { PITCH, .u.n = {"\x05[f%d]", 80, 39, 4500, 0, 0, NULL }},
-       { VOL, .u.n = {"\x05[g%d]", 21, 0, 40, 0, 0, NULL }},
-       { TONE, .u.n = {"\x05[s%d]", 9, 0, 63, 0, 0, 0 }},
-       { PUNCT, .u.n = {"\x05[A%c]", 0, 0, 3, 0, 0, "nmsa" }},
-       { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+       { CAPS_START, .u.s = {"\x05[f99]" } },
+       { CAPS_STOP, .u.s = {"\x05[f80]" } },
+       { RATE, .u.n = {"\x05[r%d]", 10, 0, 20, 100, -10, NULL } },
+       { PITCH, .u.n = {"\x05[f%d]", 80, 39, 4500, 0, 0, NULL } },
+       { VOL, .u.n = {"\x05[g%d]", 21, 0, 40, 0, 0, NULL } },
+       { TONE, .u.n = {"\x05[s%d]", 9, 0, 63, 0, 0, 0 } },
+       { PUNCT, .u.n = {"\x05[A%c]", 0, 0, 3, 0, 0, "nmsa" } },
+       { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
        V_LAST_VAR
 };