From 60d2a53dec5ba93886dcc63e93b2ecc5ba2edba7 Mon Sep 17 00:00:00 2001 From: Adam Buchbinder Date: Wed, 19 Sep 2012 21:51:08 -0400 Subject: [PATCH] --- yaml --- r: 325439 b: refs/heads/master c: bff6c3e00ca7e56ca82e19ffb722159cf1216d20 h: refs/heads/master i: 325437: ee0caa39c875b4adbb2b14e3e86d3da86786a340 325435: 931068308c7820e7ea1fa2d9effa01f222d09996 325431: 9dda8b0dcfdf06eeaf84733be31731b6060af866 325423: 7dbc663544e7f8d7183ee8c7637bdc3f72819f49 325407: 4808c63967cedb1a27942468f5a3c9e530138d2f 325375: eaca102308de1c3c6db6a2d9f4e40bb8b7542555 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rtd520.c | 2 +- trunk/drivers/staging/csr/sme_blocking.c | 4 ++-- trunk/drivers/staging/telephony/ixj.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2dac15396d67..523882856a0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2635894e8e786d7c93a21f24efb690981d15842 +refs/heads/master: bff6c3e00ca7e56ca82e19ffb722159cf1216d20 diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c index 58f5922d6e4c..d0e4844e5248 100644 --- a/trunk/drivers/staging/comedi/drivers/rtd520.c +++ b/trunk/drivers/staging/comedi/drivers/rtd520.c @@ -964,7 +964,7 @@ static int rtd_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) /* cmdtest tests a particular command to see if it is valid. Using the cmdtest ioctl, a user can create a valid cmd - and then have it executed by the cmd ioctl (asyncronously). + and then have it executed by the cmd ioctl (asynchronously). cmdtest returns 1,2,3,4 or 0, depending on which tests the command passes. diff --git a/trunk/drivers/staging/csr/sme_blocking.c b/trunk/drivers/staging/csr/sme_blocking.c index acf0f0fe3b37..543e8f2c407a 100644 --- a/trunk/drivers/staging/csr/sme_blocking.c +++ b/trunk/drivers/staging/csr/sme_blocking.c @@ -18,10 +18,10 @@ /* - * This file also contains the implementation of the asyncronous + * This file also contains the implementation of the asynchronous * requests to the SME. * - * Before calling an asyncronous SME function, we call sme_init_request() + * Before calling an asynchronous SME function, we call sme_init_request() * which gets hold of the SME semaphore and updates the request status. * The semaphore makes sure that there is only one pending request to * the SME at a time. diff --git a/trunk/drivers/staging/telephony/ixj.c b/trunk/drivers/staging/telephony/ixj.c index b303c9192e17..1cfa0b07d725 100644 --- a/trunk/drivers/staging/telephony/ixj.c +++ b/trunk/drivers/staging/telephony/ixj.c @@ -7057,7 +7057,7 @@ static int ixj_selfprobe(IXJ *j) printk(KERN_INFO "Enable Line Monitor\n"); if (ixjdebug & 0x0002) - printk(KERN_INFO "Set Line Monitor to Asyncronous Mode\n"); + printk(KERN_INFO "Set Line Monitor to Asynchronous Mode\n"); if (ixj_WriteDSPCommand(0x7E01, j)) /* Asynchronous Line Monitor */ return -1; @@ -7068,7 +7068,7 @@ static int ixj_selfprobe(IXJ *j) if (ixj_WriteDSPCommand(0x5151, j)) /* Enable DTMF detection */ return -1; - if (ixj_WriteDSPCommand(0x6E01, j)) /* Set Asyncronous Tone Generation */ + if (ixj_WriteDSPCommand(0x6E01, j)) /* Set Asynchronous Tone Generation */ return -1; set_rec_depth(j, 2); /* Set Record Channel Limit to 2 frames */