From 74c7b4c60915c039ccb4e44321b5fce5a930d5a9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 15:38:37 -0700 Subject: [PATCH] --- yaml --- r: 197202 b: refs/heads/master c: 2434358ac7ece40e6aa8cd705927c423caa718ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 7 ------- trunk/drivers/staging/comedi/internal.h | 7 ++++++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 57ec94d295a2..f85e5ed22a2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22d114248be8907f965e68a1bfdcea3302cbc776 +refs/heads/master: 2434358ac7ece40e6aa8cd705927c423caa718ec diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 3ca5832ad6f9..c26c6446a0ee 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -377,15 +377,8 @@ enum subdevice_runflags { SRF_RUNNING = 0x08000000 }; -/* - various internal comedi functions - */ - -int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg); int comedi_check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist); unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s); -int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data); /* range stuff */ diff --git a/trunk/drivers/staging/comedi/internal.h b/trunk/drivers/staging/comedi/internal.h index 7068a38d7f3c..ce121f21ebc5 100644 --- a/trunk/drivers/staging/comedi/internal.h +++ b/trunk/drivers/staging/comedi/internal.h @@ -1,4 +1,9 @@ - +/* + * various internal comedi functions + */ +int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg); +int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, + struct comedi_insn *insn, unsigned int *data); int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); void comedi_reset_async_buf(struct comedi_async *async);