Added ni_670x

diff --git a/Documentation/comedi/drivers.txt b/Documentation/comedi/drivers.txt
index 3cb421cf2be8a10ec441790c313292db110c0738..85c35e2373aa2959605c3768e160be9962838bb1 100644 (file)
--- a/Documentation/comedi/drivers.txt
+++ b/Documentation/comedi/drivers.txt
@@ -554,6 +554,16 @@ Status: works
 
 
 
+Driver: ni_670x.c
+Description: National Instruments 670x
+Author: Bart Joris <bjoris@advalvas.be>
+Updated: Wed, 22 Aug 2001 22:47:32 -0700
+
+The driver currently does not recognize the 6704, because the PCI
+ID is not known.
+
+
+
 Driver: ni_at_a2150.o
 Description: National Instruments AT-A2150
 Author: Frank Mori Hess

diff --git a/comedi/Config.in b/comedi/Config.in
index d16233cdf18b923cd9dd5f531b38f6d340b2c76e..193452254137221564fd79929f9a78c879c430af 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -56,10 +56,11 @@ if [ "$CONFIG_COMEDI_NI" = "y" ];then
        if [ "$CONFIG_PCI" = "y" ];then
                dep_tristate '  PCI-MIO E series' CONFIG_COMEDI_NI_PCIMIO $CONFIG_COMEDI
                dep_tristate '  NI PCI-DIO series' CONFIG_COMEDI_NI_PCIDIO $CONFIG_COMEDI
-               if [ "$CONFIG_COMEDI_NI_PCIMIO" = "y" -o "$CONFIG_COMEDI_NI_PCIDIO" = "y" ];then
+               dep_tristate '  NI 670x series' CONFIG_COMEDI_NI_670X $CONFIG_COMEDI
+               if [ "$CONFIG_COMEDI_NI_PCIMIO" = "y" -o "$CONFIG_COMEDI_NI_PCIDIO" = "y" -o "$CONFIG_COMEDI_NI_670X" = "y" ];then
                        define_bool CONFIG_COMEDI_MITE y
                else
-                       if [ "$CONFIG_COMEDI_NI_PCIMIO" = "m" -o "$CONFIG_COMEDI_NI_PCIDIO" = "m" ];then
+                       if [ "$CONFIG_COMEDI_NI_PCIMIO" = "m" -o "$CONFIG_COMEDI_NI_PCIDIO" = "m" -o "$CONFIG_COMEDI_NI_670X" = "m" ];then
                                define_bool CONFIG_COMEDI_MITE m
                        fi
                fi

diff --git a/comedi/drivers/Makefile b/comedi/drivers/Makefile
index ee0fbe8e0acbc6899213f18aac1619dfffce0857..c343953f39bff7a6679cfa967f0c9ac15b0793d5 100644 (file)
--- a/comedi/drivers/Makefile
+++ b/comedi/drivers/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_COMEDI_NI_PCIDIO)                += ni_pcidio.o
 obj-$(CONFIG_COMEDI_MITE)              += mite.o
 obj-$(CONFIG_COMEDI_NI_ATMIO16D)       += ni_atmio16d.o
 obj-$(CONFIG_COMEDI_NI_AT_A2150)       += ni_at_a2150.o
+obj-$(CONFIG_COMEDI_NI_670X)           += ni_670x.o
 
 obj-$(CONFIG_COMEDI_PCM3730)           += pcm3730.o
 

diff --git a/comedi/drivers/Makefile.in b/comedi/drivers/Makefile.in
index 17b26285eec18ced347c567b7d69e2dde0ff3ccc..fe33139b18dbf3481ba3cae68319641b180b38d1 100644 (file)
--- a/comedi/drivers/Makefile.in
+++ b/comedi/drivers/Makefile.in
@@ -26,6 +26,7 @@ select(CONFIG_COMEDI_FL512 fl512.o)
 select(CONFIG_COMEDI_II_PCI20KC ii_pci20kc.o)
 select(CONFIG_COMEDI_MULTIQ3 multiq3.o)
 select(CONFIG_COMEDI_MPC8260CPM mpc8260cpm.o)
+select(CONFIG_COMEDI_NI_ATMIO ni_670x.o)
 select(CONFIG_COMEDI_NI_ATMIO ni_atmio.o)
 select(CONFIG_COMEDI_NI_MIO_CS ni_mio_cs.o)
 select(CONFIG_COMEDI_NI_PCIMIO ni_pcimio.o)