diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/comedi/kcomedilib/dio.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
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 8595567..30192f3 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]; |