From 3a5fa27516116352e810b2122afd82c3d5cbcc7e Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 19 Jun 2012 10:17:44 +0100 Subject: staging: comedi: rename internal.h to comedi_internal.h Use a less generic name for this internal header file included by various parts of the comedi core. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_fops.c | 2 +- drivers/staging/comedi/comedi_internal.h | 16 ++++++++++++++++ drivers/staging/comedi/drivers.c | 2 +- drivers/staging/comedi/internal.h | 16 ---------------- drivers/staging/comedi/range.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 drivers/staging/comedi/comedi_internal.h delete mode 100644 drivers/staging/comedi/internal.h diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 3650753b62f7..1079b0e7a264 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -49,7 +49,7 @@ #include #include -#include "internal.h" +#include "comedi_internal.h" MODULE_AUTHOR("http://www.comedi.org"); MODULE_DESCRIPTION("Comedi core module"); diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h new file mode 100644 index 000000000000..7ed20a04eef5 --- /dev/null +++ b/drivers/staging/comedi/comedi_internal.h @@ -0,0 +1,16 @@ +/* + * various internal comedi stuff + */ +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); +void comedi_reset_async_buf(struct comedi_async *async); +int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, + unsigned long new_size); + +extern unsigned int comedi_default_buf_size_kb; +extern unsigned int comedi_default_buf_maxsize_kb; diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index bac3bc11d519..fe455e786ee4 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -45,7 +45,7 @@ #include #include "comedidev.h" -#include "internal.h" +#include "comedi_internal.h" static int postconfig(struct comedi_device *dev); static int insn_rw_emulate_bits(struct comedi_device *dev, diff --git a/drivers/staging/comedi/internal.h b/drivers/staging/comedi/internal.h deleted file mode 100644 index 7ed20a04eef5..000000000000 --- a/drivers/staging/comedi/internal.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * various internal comedi stuff - */ -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); -void comedi_reset_async_buf(struct comedi_async *async); -int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, - unsigned long new_size); - -extern unsigned int comedi_default_buf_size_kb; -extern unsigned int comedi_default_buf_maxsize_kb; diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c index 148ec6fd6fdd..41f95237789d 100644 --- a/drivers/staging/comedi/range.c +++ b/drivers/staging/comedi/range.c @@ -23,7 +23,7 @@ #include #include "comedidev.h" -#include "internal.h" +#include "comedi_internal.h" const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} }; EXPORT_SYMBOL(range_bipolar10); -- cgit v1.2.3-55-g7522