restored include of comedidev.h from comedi_rt.h so that spin locks can be used throu...

through comedidev.h.  This include was originally removed due to circular dependence between comedidev.h and comedi_rt.h
but they're just header files so it doesn't seem to matter.

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 8cfe420ed360a223b0647d33e5d856c3f2ac6464..8b7b88144831fce9892bd3d359124391ca0e4008 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -23,7 +23,7 @@
 
 #undef DEBUG
 
-#include <linux/comedidev.h>
+#include <linux/comedi_rt.h>
 
 #define __NO_VERSION__
 #include <linux/module.h>

diff --git a/comedi/rt_pend_tq/rt_pend_tq.c b/comedi/rt_pend_tq/rt_pend_tq.c
index ff08ed76d79d90787c6e8374c8b3076716278a14..c670e76dc084b40d0dc92c3e7e21350e0f8b1a77 100644 (file)
--- a/comedi/rt_pend_tq/rt_pend_tq.c
+++ b/comedi/rt_pend_tq/rt_pend_tq.c
@@ -2,7 +2,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
-#include <linux/comedidev.h>   // for rt spinlocks
+#include <linux/comedi_rt.h>   // for rt spinlocks
 #include "rt_pend_tq.h"
 #ifdef CONFIG_COMEDI_RTAI
 #include <rtai.h>

diff --git a/include/linux/comedi_rt.h b/include/linux/comedi_rt.h
index d420817096b631fe7b9b88a8861029ea20ad37ba..64225872ca5443aff1c0d05b74676371f004e9f8 100644 (file)
--- a/include/linux/comedi_rt.h
+++ b/include/linux/comedi_rt.h
@@ -31,6 +31,7 @@
 #include <linux/malloc.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
+#include "comedidev.h"
 
 #ifdef CONFIG_COMEDI_RT