---

yaml --- r: 354340 b: refs/heads/master c: e9ab1c2 h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · 323fdf7 · 323fdf7
1 parent 11be97d
commit 323fdf7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);