---

yaml
---
r: 197174
b: refs/heads/master
c: 7382e57
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bf935596bfabe3f951bc0331ebd893ef06e1123
+refs/heads/master: 7382e5711f3adc934227473f82156ae1e2d7e562

trunk/drivers/staging/comedi/kcomedilib/Makefile

@@ -2,7 +2,6 @@ obj-$(CONFIG_COMEDI)	+= kcomedilib.o
 
 kcomedilib-objs :=				\
 			data.o			\
-			ksyms.o			\
 			dio.o			\
 			kcomedilib_main.o	\
 			get.o

trunk/drivers/staging/comedi/kcomedilib/dio.c

@@ -25,6 +25,7 @@
 #include "../comedilib.h"
 
 #include <linux/string.h>
+#include <linux/module.h>
 
 int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan,
 		      unsigned int io)
@@ -40,6 +41,7 @@ int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan,
 
 	return comedi_do_insn(dev, &insn);
 }
+EXPORT_SYMBOL(comedi_dio_config);
 
 int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan,
 		    unsigned int *val)
@@ -93,3 +95,4 @@ int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask,
 
 	return ret;
 }
+EXPORT_SYMBOL(comedi_dio_bitfield);

trunk/drivers/staging/comedi/kcomedilib/get.c

@@ -81,6 +81,7 @@ int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd)
 	}
 	return -1;
 }
+EXPORT_SYMBOL(comedi_find_subdevice_by_type);
 
 int comedi_get_n_channels(void *d, unsigned int subdevice)
 {
@@ -89,6 +90,7 @@ int comedi_get_n_channels(void *d, unsigned int subdevice)
 
 	return s->n_chan;
 }
+EXPORT_SYMBOL(comedi_get_n_channels);
 
 int comedi_get_len_chanlist(void *d, unsigned int subdevice)
 {
@@ -117,11 +119,10 @@ int comedi_get_rangetype(void *d, unsigned int subdevice, unsigned int chan)
 	struct comedi_subdevice *s = dev->subdevices + subdevice;
 	int ret;
 
-	if (s->range_table_list) {
+	if (s->range_table_list)
 		ret = s->range_table_list[chan]->length;
-	} else {
+	else
 		ret = s->range_table->length;
-	}
 
 	ret = ret | (dev->minor << 28) | (subdevice << 24) | (chan << 16);
 
@@ -135,11 +136,10 @@ int comedi_get_n_ranges(void *d, unsigned int subdevice, unsigned int chan)
 	struct comedi_subdevice *s = dev->subdevices + subdevice;
 	int ret;
 
-	if (s->range_table_list) {
+	if (s->range_table_list)
 		ret = s->range_table_list[chan]->length;
-	} else {
+	else
 		ret = s->range_table->length;
-	}
 
 	return ret;
 }
@@ -154,11 +154,11 @@ int comedi_get_krange(void *d, unsigned int subdevice, unsigned int chan,
 	struct comedi_subdevice *s = dev->subdevices + subdevice;
 	const struct comedi_lrange *lr;
 
-	if (s->range_table_list) {
+	if (s->range_table_list)
 		lr = s->range_table_list[chan];
-	} else {
+	else
 		lr = s->range_table;
-	}
+
 	if (range >= lr->length)
 		return -EINVAL;
 

trunk/drivers/staging/comedi/kcomedilib/kcomedilib_main.c

@@ -31,7 +31,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "../comedi.h"
 #include "../comedilib.h"
@@ -68,6 +68,7 @@ void *comedi_open(const char *filename)
 
 	return (void *)dev;
 }
+EXPORT_SYMBOL(comedi_open);
 
 void *comedi_open_old(unsigned int minor)
 {
@@ -96,6 +97,7 @@ int comedi_close(void *d)
 
 	return 0;
 }
+EXPORT_SYMBOL(comedi_close);
 
 int comedi_loglevel(int newlevel)
 {
@@ -104,7 +106,7 @@ int comedi_loglevel(int newlevel)
 
 void comedi_perror(const char *message)
 {
-	printk("%s: unknown error\n", message);
+	printk(KERN_ERR "%s: unknown error\n", message);
 }
 
 char *comedi_strerror(int err)