fix hidden include of linux/module.h by rtl.h

diff --git a/comedi/drivers/8253.h b/comedi/drivers/8253.h
index fbec196cc8d93748326081ddfef51f71627c10cb..85073bf29437f85d5a1671458a8e1d670441c2f9 100644 (file)
--- a/comedi/drivers/8253.h
+++ b/comedi/drivers/8253.h
@@ -78,7 +78,7 @@ static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base, unsigned
        int div1, div2;
        int base;
 
-       for (div1 = 1; div1 <= (1 << 16); div1 <<= 1) {
+       for (div1 = 2; div1 <= (1 << 16); div1 <<= 1) {
                base = i8253_osc_base * div1;
                switch (round_mode) {
                case TRIG_ROUND_NEAREST:
@@ -92,6 +92,7 @@ static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base, unsigned
                        div2 = (*nanosec + base - 1) / base;
                        break;
                }
+               if (div2 < 2) div2 = 2;
                if (div2 <= 65536) {
                        *nanosec = div2 * base;
                        *d1 = div1 & 0xffff;

diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index a97e330ba3144725b81c3b0ad6c812ffce25e2b3..f1ea1e42946c3145a25834f64f913fe107c2541e 100644 (file)
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -27,6 +27,15 @@
    This driver is for both the NI PCI-DIO-32HS and the PCI-DIO-96,
    which have very different architectures.  But, since the '96 is
    so simple, it is included here.
+
+   Manuals (available from ftp://ftp.natinst.com/support/manuals)
+
+       320938c.pdf     PCI-DIO-96/PXI-6508/PCI-6503 User Manual
+       321464a.pdf     AT/PCI-DIO-32HS User Manual
+       321464b.pdf     AT/PCI-DIO-32HS User Manual
+       321329A.pdf     PCI-6533 Register-Level Programmer Manual
+       321330A.pdf     DAQ-DIO Technical Reference Manual
+
  */
 
 #include <linux/kernel.h>

diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c
index c5eca85041e293cdb8a00453fa83cb123297c574..705407109081d2103b85de384668ebcdc6b14bf4 100644 (file)
--- a/comedi/drivers/pcl812.c
+++ b/comedi/drivers/pcl812.c
@@ -282,7 +282,7 @@ static int pcl812_ao_mode0(comedi_device * dev, comedi_subdevice * s, comedi_tri
                data = it->data[i];
 
                outb((data & 0xff), dev->iobase + (chan ? PCL812_DA2_LO : PCL812_DA1_LO));
-               outb(((data & 0xf) >> 8), dev->iobase + (chan ? PCL812_DA2_HI : PCL812_DA1_HI));
+               outb((data >> 8) & 0x0f, dev->iobase + (chan ? PCL812_DA2_HI : PCL812_DA1_HI));
        }
 
        return i;
@@ -358,7 +358,7 @@ static void interrupt_pcl812_ai_mode13_int(int irq, void *d, struct pt_regs *reg
                if (s->cur_trig.flags & TRIG_WAKE_EOS) {
                        comedi_eos(dev, s);
                } else {
-                       comedi_eobuf(dev, s);
+                       comedi_bufcheck(dev, s);
                }
                devpriv->int13_act_scan++;
        } else {

diff --git a/comedi/rtl.c b/comedi/rtl.c
index 33b5bae0e57221de2bffc0cb970d646845a42cae..e5b7457ff1697581d90f5d8ab74f896a475d27d1 100644 (file)
--- a/comedi/rtl.c
+++ b/comedi/rtl.c
@@ -3,6 +3,8 @@
  *
  */
 
+#define __NO_VERSION__
+
 #include <comedi_module.h>
 
 #include <linux/kernel.h>