---

yaml --- r: 354306 b: refs/heads/master c: 39bd5e5 h: refs/heads/master v: v3
git-mirror · Jan 31, 2013 · f0231d3 · f0231d3
1 parent a3026d0
commit f0231d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ae6b20b88737f1828649b6cbe349c83b9f97bf0
+refs/heads/master: 39bd5e59b1ebdaa58d9458923ab96f61bda1296c
diff --git a/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h
@@ -8,8 +8,6 @@
  */
 int do_rangeinfo_ioctl(struct comedi_device *dev,
 		       struct comedi_rangeinfo __user *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);
 int comedi_find_board_minor(struct device *hardware_device);
@@ -22,6 +20,15 @@ unsigned int comedi_buf_write_n_allocated(struct comedi_async *async);
 extern unsigned int comedi_default_buf_size_kb;
 extern unsigned int comedi_default_buf_maxsize_kb;
 extern bool comedi_autoconfig;
+
+/* drivers.c */
+
 extern struct comedi_driver *comedi_drivers;
 
+int insn_inval(struct comedi_device *, struct comedi_subdevice *,
+	       struct comedi_insn *, unsigned int *);
+
+void comedi_device_detach(struct comedi_device *);
+int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *);
+
 #endif /* _COMEDI_INTERNAL_H */
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
@@ -369,9 +369,6 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s);
 
 int comedi_alloc_subdevices(struct comedi_device *, int);
 
-void comedi_device_detach(struct comedi_device *);
-int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *);
-
 int comedi_auto_config(struct device *, struct comedi_driver *,
 		       unsigned long context);
 void comedi_auto_unconfig(struct device *);