diff options
| author | Greg Kroah-Hartman | 2010-05-04 00:20:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:36:03 +0200 |
| commit | 242e7ad91a067243d7ab63b6a25ed2e085733446 (patch) | |
| tree | b2e077e9a287a48748d1a6a8902701203ce988ea | |
| parent | Staging: comedi: make comedi_set_subdevice_runflags() static (diff) | |
| download | kernel-qcow2-linux-242e7ad91a067243d7ab63b6a25ed2e085733446.tar.gz kernel-qcow2-linux-242e7ad91a067243d7ab63b6a25ed2e085733446.tar.xz kernel-qcow2-linux-242e7ad91a067243d7ab63b6a25ed2e085733446.zip | |
Staging: comedi: make comedi_alloc_board_minor local to comedi core
No one outside of the comedi core calls this function, so create
an internal.h file to put the prototype in, and don't export
it to the world.
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 3 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 5 | ||||
| -rw-r--r-- | drivers/staging/comedi/internal.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 135c80ab6d10..2634af2f33df 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -49,7 +49,7 @@ #include <linux/io.h> #include <linux/uaccess.h> -/* #include "kvmem.h" */ +#include "internal.h" MODULE_AUTHOR("http://www.comedi.org"); MODULE_DESCRIPTION("Comedi core module"); @@ -2156,7 +2156,6 @@ int comedi_alloc_board_minor(struct device *hardware_device) } return i; } -EXPORT_SYMBOL_GPL(comedi_alloc_board_minor); void comedi_free_board_minor(unsigned minor) { diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 9e13964ac6d3..5f017c2383b3 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -522,7 +522,6 @@ static inline void *comedi_aux_data(int options[], int n) return (void *)address; } -int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s); diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index a8f3d790b3d5..475778fb6801 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -37,15 +37,16 @@ #include <linux/ioport.h> #include <linux/mm.h> #include <linux/slab.h> -#include "comedidev.h" #include <linux/highmem.h> /* for SuSE brokenness */ #include <linux/vmalloc.h> #include <linux/cdev.h> #include <linux/dma-mapping.h> - #include <linux/io.h> #include <asm/system.h> +#include "comedidev.h" +#include "internal.h" + static int postconfig(struct comedi_device *dev); static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s, diff --git a/drivers/staging/comedi/internal.h b/drivers/staging/comedi/internal.h new file mode 100644 index 000000000000..4ced6bfa7e9c --- /dev/null +++ b/drivers/staging/comedi/internal.h @@ -0,0 +1,2 @@ + +int comedi_alloc_board_minor(struct device *hardware_device); |