Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 175083
b: refs/heads/master
c: 828684f
h: refs/heads/master
i:
  175081: 1dd8cd6
  175079: cb05897
v: v3
  • Loading branch information
Dirk Hohndel authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 67f5ead commit 61eeadc
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56f5f24d1b5fd4562bc83cc9a06cc7c817141b4d
refs/heads/master: 828684f9a6e096f9150bad523c43b75d74b9badd
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT)
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/cb_pcidda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ static int cb_pcidda_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER
&& cmd->scan_begin_src != TRIG_EXT)
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/dmm32at.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT)
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/dt2814.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static int dt2814_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->stop_src != TRIG_TIMER && cmd->stop_src != TRIG_EXT)
err++;

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/comedi/drivers/dt282x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_FOLLOW &&
cmd->scan_begin_src != TRIG_EXT)
err++;
Expand Down Expand Up @@ -1050,7 +1050,7 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->stop_src != TRIG_COUNT && cmd->stop_src != TRIG_NONE)
err++;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_atmio16d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static int atmio16d_ai_cmdtest(struct comedi_device *dev,
return 1;

/* step 2: make sure trigger sources are unique & mutually compatible */
/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_FOLLOW &&
cmd->scan_begin_src != TRIG_EXT &&
cmd->scan_begin_src != TRIG_TIMER)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_mio_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->start_src != TRIG_NOW &&
cmd->start_src != TRIG_INT && cmd->start_src != TRIG_EXT)
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_pcidio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ static int ni_pcidio_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_INT)
err++;
if (cmd->scan_begin_src != TRIG_TIMER &&
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_FOLLOW)
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/rtd520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique
and mutually compatible */
/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT) {
err++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/s626.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1926,7 +1926,7 @@ static int s626_ai_cmdtest(struct comedi_device *dev,
/* step 2: make sure trigger sources are unique and mutually
compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT
&& cmd->scan_begin_src != TRIG_FOLLOW)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/skel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ static int skel_ai_cmdtest(struct comedi_device *dev,

/* step 2: make sure trigger sources are unique and mutually compatible */

/* note that mutual compatiblity is not an issue here */
/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT)
err++;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/comedi/drivers/usbdux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,

/*
* step 2: make sure trigger sources are unique and mutually compatible
* note that mutual compatiblity is not an issue here
* note that mutual compatibility is not an issue here
*/
if (cmd->scan_begin_src != TRIG_FOLLOW &&
cmd->scan_begin_src != TRIG_EXT &&
Expand Down Expand Up @@ -1557,7 +1557,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,

/*
* step 2: make sure trigger sources are unique and mutually compatible
* note that mutual compatiblity is not an issue here
* note that mutual compatibility is not an issue here
*/
if (cmd->scan_begin_src != TRIG_FOLLOW &&
cmd->scan_begin_src != TRIG_EXT &&
Expand Down

0 comments on commit 61eeadc

Please sign in to comment.