From 323fdf74761ec2330a30038846242d13901ccc09 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 1 Feb 2013 10:20:29 +0000 Subject: [PATCH] --- yaml --- r: 354340 b: refs/heads/master c: e9ab1c2f7eb6bc5d885429381e773bc1a61646ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_internal.h | 3 +++ trunk/drivers/staging/comedi/comedidev.h | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e17e9584f547..339a2e3125c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eec0d0dc4e16c0c412db337acc36f95411ef946e +refs/heads/master: e9ab1c2f7eb6bc5d885429381e773bc1a61646ca diff --git a/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h index b36bb954db58..f4f0ff293797 100644 --- a/trunk/drivers/staging/comedi/comedi_internal.h +++ b/trunk/drivers/staging/comedi/comedi_internal.h @@ -11,6 +11,9 @@ int do_rangeinfo_ioctl(struct comedi_device *dev, int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); int comedi_find_board_minor(struct device *hardware_device); +int comedi_alloc_subdevice_minor(struct comedi_device *dev, + struct comedi_subdevice *s); +void comedi_free_subdevice_minor(struct comedi_subdevice *s); int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, unsigned long new_size); diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index f4541aec419e..484321d546dd 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -348,10 +348,6 @@ void comedi_buf_memcpy_to(struct comedi_async *async, unsigned int offset, void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset, void *destination, unsigned int num_bytes); -int comedi_alloc_subdevice_minor(struct comedi_device *dev, - struct comedi_subdevice *s); -void comedi_free_subdevice_minor(struct comedi_subdevice *s); - /* drivers.c - general comedi driver functions */ int comedi_alloc_subdevices(struct comedi_device *, int);