fixes for kcomedilib with trigger support off. comedi_dio_config() was using

trigger code instead of insn, I assumed there was no good reason for this such
as the insn code not working.

diff --git a/comedi/kcomedilib/dio.c b/comedi/kcomedilib/dio.c
index 01a545604fe0fdf8b9d3d3acd2bad2627005bf03..7ed37bea545d6d0cc2eeeab5150be726ee468504 100644 (file)
--- a/comedi/kcomedilib/dio.c
+++ b/comedi/kcomedilib/dio.c
@@ -47,7 +47,7 @@ extern volatile int rtcomedi_lock_semaphore;
 int comedi_dio_config(unsigned int dev,unsigned int subdev,unsigned int chan,
        unsigned int io)
 {
-#if 0
+#ifdef USE_INSN
        comedi_insn insn;
 
        memset(&insn,0,sizeof(insn));

diff --git a/comedi/kcomedilib/ksyms.c b/comedi/kcomedilib/ksyms.c
index 7abd4dff23e6e2ce0a0817ec6dc5f438e3352b3c..5cf236c82764fb1bb9ed27058b76fd4bcd016f06 100644 (file)
--- a/comedi/kcomedilib/ksyms.c
+++ b/comedi/kcomedilib/ksyms.c
@@ -43,7 +43,9 @@
 
 /* functions specific to kcomedilib */
 
+#ifdef CONFIG_COMEDI_TRIG
 EXPORT_SYMBOL(__comedi_trigger);
+#endif
 EXPORT_SYMBOL(comedi_register_callback);
 EXPORT_SYMBOL(comedi_get_subdevice_flags);
 EXPORT_SYMBOL(comedi_get_len_chanlist);
@@ -79,7 +81,9 @@ EXPORT_SYMBOL(comedi_get_n_ranges);
 //EXPORT_SYMBOL(comedi_range_is_chan_specific);
 //EXPORT_SYMBOL(comedi_maxdata_is_chan_specific);
 EXPORT_SYMBOL(comedi_cancel);
+#ifdef CONFIG_COMEDI_TRIG
 EXPORT_SYMBOL(comedi_trigger);
+#endif
 EXPORT_SYMBOL(comedi_command);
 EXPORT_SYMBOL(comedi_command_test);
 //EXPORT_SYMBOL(comedi_do_insnlist);