From 469c0f9fb321c4240a96cb370fe3563e18e07ebd Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cmbrannon79@gmail.com>
Date: Thu, 14 Oct 2010 19:23:47 -0500
Subject: [PATCH] --- yaml --- r: 220340 b: refs/heads/master c:
 28ba8677bcbe9c0365b32d6007a344b49c8c1204 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/speakup/speakup_acntsa.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ba59a696eb3d..26b8410889f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf4a4bacb051c278cca819600ecb4ab3f0902f17
+refs/heads/master: 28ba8677bcbe9c0365b32d6007a344b49c8c1204
diff --git a/trunk/drivers/staging/speakup/speakup_acntsa.c b/trunk/drivers/staging/speakup/speakup_acntsa.c
index 0418c9df9479..590fa6bb0ed4 100644
--- a/trunk/drivers/staging/speakup/speakup_acntsa.c
+++ b/trunk/drivers/staging/speakup/speakup_acntsa.c
@@ -28,19 +28,18 @@
 #include "speakup_acnt.h" /* local header file for Accent values */
 
 #define DRV_VERSION "2.11"
-#define synth_full() (inb_p(speakup_info.port_tts + UART_RX) == 'F')
 #define PROCSPEECH '\r'
 
 static int synth_probe(struct spk_synth *synth);
 
 static struct var_t vars[] = {
-	{ CAPS_START, .u.s = {"\033P8" }},
-	{ CAPS_STOP, .u.s = {"\033P5" }},
-	{ RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" }},
-	{ PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL }},
-	{ VOL, .u.n = {"\033A%d", 9, 0, 9, 0, 0, NULL }},
-	{ TONE, .u.n = {"\033V%d", 5, 0, 9, 0, 0, NULL }},
-	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+	{ CAPS_START, .u.s = {"\033P8" } },
+	{ CAPS_STOP, .u.s = {"\033P5" } },
+	{ RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" } },
+	{ PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL } },
+	{ VOL, .u.n = {"\033A%d", 9, 0, 9, 0, 0, NULL } },
+	{ TONE, .u.n = {"\033V%d", 5, 0, 9, 0, 0, NULL } },
+	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
 	V_LAST_VAR
 };