Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/drivers/staging/speakup/speakup_dummy.c b/drivers/staging/speakup/speakup_dummy.c
index 6712a728faa727068e60a9f07dc46410434983cb..c20f41188be12364d59dc1517f864723c7057a8e 100644 (file)
--- a/drivers/staging/speakup/speakup_dummy.c
+++ b/drivers/staging/speakup/speakup_dummy.c
@@ -32,13 +32,13 @@
 #define SYNTH_CLEAR '!'
 
 static struct var_t vars[] = {
-       { CAPS_START, .u.s = {"CAPS_START\n" }},
-       { CAPS_STOP, .u.s = {"CAPS_STOP\n" }},
-       { RATE, .u.n = {"RATE %d\n", 8, 1, 16, 0, 0, NULL }},
-       { PITCH, .u.n = {"PITCH %d\n", 8, 0, 16, 0, 0, NULL }},
-       { VOL, .u.n = {"VOL %d\n", 8, 0, 16, 0, 0, NULL }},
-       { TONE, .u.n = {"TONE %d\n", 8, 0, 16, 0, 0, NULL }},
-       { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+       { CAPS_START, .u.s = {"CAPS_START\n" } },
+       { CAPS_STOP, .u.s = {"CAPS_STOP\n" } },
+       { RATE, .u.n = {"RATE %d\n", 8, 1, 16, 0, 0, NULL } },
+       { PITCH, .u.n = {"PITCH %d\n", 8, 0, 16, 0, 0, NULL } },
+       { VOL, .u.n = {"VOL %d\n", 8, 0, 16, 0, 0, NULL } },
+       { TONE, .u.n = {"TONE %d\n", 8, 0, 16, 0, 0, NULL } },
+       { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
        V_LAST_VAR
 };