From 9b861a02b665ee3521b0eda213ce763c10f49ed0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 14:49:54 -0700 Subject: [PATCH] --- yaml --- r: 197194 b: refs/heads/master c: 88cccef0193a7f8c6a73326404c0b2f9ad27f71a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedilib.h | 3 --- trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cfc6ee35fbd3..b4806394c43c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1525758c848aedf590bba3a919321e2d80fcd6e +refs/heads/master: 88cccef0193a7f8c6a73326404c0b2f9ad27f71a diff --git a/trunk/drivers/staging/comedi/comedilib.h b/trunk/drivers/staging/comedi/comedilib.h index 00414359138d..23ec58d2e239 100644 --- a/trunk/drivers/staging/comedi/comedilib.h +++ b/trunk/drivers/staging/comedi/comedilib.h @@ -33,7 +33,4 @@ int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, int comedi_find_subdevice_by_type(void *dev, int type, unsigned int subd); int comedi_get_n_channels(void *dev, unsigned int subdevice); -/* internal to kcomedilb */ -int comedi_do_insn(void *dev, struct comedi_insn *insn); - #endif diff --git a/trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 7cb29f2bc862..d27de93ff4dd 100644 --- a/trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -84,7 +84,7 @@ EXPORT_SYMBOL(comedi_close); * COMEDI_INSN * perform an instruction */ -int comedi_do_insn(void *d, struct comedi_insn *insn) +static int comedi_do_insn(void *d, struct comedi_insn *insn) { struct comedi_device *dev = (struct comedi_device *)d; struct comedi_subdevice *s;