From 153595e57eb5d3c9cb587dbdb7cf331b621308ea Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Mon, 9 Jul 2012 07:30:27 -0700 Subject: [PATCH] --- yaml --- r: 317805 b: refs/heads/master c: 83414d528d2f97d6574c14afb892879c11bbcc7c h: refs/heads/master i: 317803: 9bcad0086ab0ca21e9d6b9708f1cb4707d7fe294 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/i18n.c | 2 +- trunk/drivers/staging/speakup/speakup_acnt.h | 2 +- trunk/drivers/staging/speakup/speakup_decpc.c | 2 +- trunk/drivers/staging/speakup/synth.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f2a981d6667f..f075acbce441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b733a1b0f7b83caef204b1d3cbee2c85b00a055 +refs/heads/master: 83414d528d2f97d6574c14afb892879c11bbcc7c diff --git a/trunk/drivers/staging/speakup/i18n.c b/trunk/drivers/staging/speakup/i18n.c index c2119433f333..ca01734d13c5 100644 --- a/trunk/drivers/staging/speakup/i18n.c +++ b/trunk/drivers/staging/speakup/i18n.c @@ -71,7 +71,7 @@ static char *speakup_default_msgs[MSG_LAST_INDEX] = { [MSG_CTL_SHIFT] = "shift", [MSG_CTL_ALTGR] = "altgr", [MSG_CTL_CONTROL] = "control", - [MSG_CTL_ALT] = "ault", + [MSG_CTL_ALT] = "alt", [MSG_CTL_LSHIFT] = "l shift", [MSG_CTL_SPEAKUP] = "speakup", [MSG_CTL_LCONTROL] = "l control", diff --git a/trunk/drivers/staging/speakup/speakup_acnt.h b/trunk/drivers/staging/speakup/speakup_acnt.h index 2d883654ffcc..6376fca9e0e1 100644 --- a/trunk/drivers/staging/speakup/speakup_acnt.h +++ b/trunk/drivers/staging/speakup/speakup_acnt.h @@ -12,5 +12,5 @@ to accept a byte of data. */ #define SYNTH_QUIET 'S' /* synth is not speaking */ #define SYNTH_FULL 'F' /* synth is full. */ -#define SYNTH_ALMOST_EMPTY 'M' /* synth has les than 2 seconds of text left */ +#define SYNTH_ALMOST_EMPTY 'M' /* synth has less than 2 seconds of text left */ #define SYNTH_SPEAKING 's' /* synth is speaking and has a fare way to go */ diff --git a/trunk/drivers/staging/speakup/speakup_decpc.c b/trunk/drivers/staging/speakup/speakup_decpc.c index de25527decf6..a09a0c9975df 100644 --- a/trunk/drivers/staging/speakup/speakup_decpc.c +++ b/trunk/drivers/staging/speakup/speakup_decpc.c @@ -66,7 +66,7 @@ #define CMD_null 0x0000 /* post status */ #define CMD_control 0x1000 /* hard control command */ #define CTRL_mask 0x0F00 /* mask off control nibble */ -#define CTRL_data 0x00FF /* madk to get data byte */ +#define CTRL_data 0x00FF /* mask to get data byte */ #define CTRL_null 0x0000 /* null control */ #define CTRL_vol_up 0x0100 /* increase volume */ #define CTRL_vol_down 0x0200 /* decrease volume */ diff --git a/trunk/drivers/staging/speakup/synth.c b/trunk/drivers/staging/speakup/synth.c index 331eae788700..df9533798095 100644 --- a/trunk/drivers/staging/speakup/synth.c +++ b/trunk/drivers/staging/speakup/synth.c @@ -64,7 +64,7 @@ EXPORT_SYMBOL_GPL(serial_synth_probe); /* Main loop of the progression thread: keep eating from the buffer * and push to the serial port, waiting as needed * - * For devices that have a "full" notification mecanism, the driver can + * For devices that have a "full" notification mechanism, the driver can * adapt the loop the way they prefer. */ void spk_do_catch_up(struct spk_synth *synth)