diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-07 16:10:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-07 16:10:51 +1000 |
| commit | 410608ae96f903bc86babbeaa373a2df02239435 (patch) | |
| tree | 7e5f36a5eb82295c234661c835b503e1e06de3a0 /drivers/staging/comedi/kcomedilib/dio.c | |
| parent | 4385012fdb698bf8384775517fdbd9adb8505729 (diff) | |
| parent | 722ef7425d0fd93972c6aab5120e9f72453b65c9 (diff) | |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/comedi/kcomedilib/dio.c')
| -rw-r--r-- | drivers/staging/comedi/kcomedilib/dio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/kcomedilib/dio.c b/drivers/staging/comedi/kcomedilib/dio.c index 8595567e48fb..30192f3c4652 100644 --- a/drivers/staging/comedi/kcomedilib/dio.c +++ b/drivers/staging/comedi/kcomedilib/dio.c @@ -27,7 +27,7 @@ #include <linux/string.h> int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, - unsigned int io) + unsigned int io) { struct comedi_insn insn; @@ -42,7 +42,7 @@ int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, } int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, - unsigned int *val) + unsigned int *val) { struct comedi_insn insn; @@ -57,7 +57,7 @@ int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, } int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, - unsigned int val) + unsigned int val) { struct comedi_insn insn; @@ -72,7 +72,7 @@ int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, } int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, - unsigned int *bits) + unsigned int *bits) { struct comedi_insn insn; unsigned int data[2]; |