From 8c906d116426add34451699e4f427786ba00cb97 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 15:20:29 -0700 Subject: [PATCH] --- yaml --- r: 197198 b: refs/heads/master c: 242e7ad91a067243d7ab63b6a25ed2e085733446 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 3 +-- trunk/drivers/staging/comedi/comedidev.h | 1 - trunk/drivers/staging/comedi/drivers.c | 5 +++-- trunk/drivers/staging/comedi/internal.h | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 trunk/drivers/staging/comedi/internal.h diff --git a/[refs] b/[refs] index 0ca873211243..f53d35f94068 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 181bd67bf5780b941f2cba6247ed1c0cdfce468a +refs/heads/master: 242e7ad91a067243d7ab63b6a25ed2e085733446 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 135c80ab6d10..2634af2f33df 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -49,7 +49,7 @@ #include #include -/* #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/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 9e13964ac6d3..5f017c2383b3 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/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/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index a8f3d790b3d5..475778fb6801 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -37,15 +37,16 @@ #include #include #include -#include "comedidev.h" #include /* for SuSE brokenness */ #include #include #include - #include #include +#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/trunk/drivers/staging/comedi/internal.h b/trunk/drivers/staging/comedi/internal.h new file mode 100644 index 000000000000..4ced6bfa7e9c --- /dev/null +++ b/trunk/drivers/staging/comedi/internal.h @@ -0,0 +1,2 @@ + +int comedi_alloc_board_minor(struct device *hardware_device);