Updates for cb_pcidda driver

diff --git a/Documentation/comedi/drivers.txt b/Documentation/comedi/drivers.txt
index 40520f9e492b4800772db13dce9a581f9d8ee5d6..49513b6426fbf60baefd8cb005a9a1234e5d2c06 100644 (file)
--- a/Documentation/comedi/drivers.txt
+++ b/Documentation/comedi/drivers.txt
@@ -102,6 +102,19 @@ Configuration options:
 
 
 
+Driver: cb_pcidda.o
+Description: ComputerBoards PCI-DDA series
+Author: Ivan Martinez <ivanmr@altavista.com>
+Status: supports 08/16, 04/16, 02/16, 08/12, 04/12, and 02/12
+
+Configuration options:
+  [0] - PCI bus of device (optional)
+          If bus/slot is not specified, the first available PCI
+         device will be used.
+  [1] - PCI slot of device (optional)
+
+
+
 Driver: comedi_parport.o
 Description: Standard PC parallel port
 Author: ds

diff --git a/comedi/Config.in b/comedi/Config.in
index d8bcfc9784a29f5f715cfd4b39a4c49aee9b4edb..ae34ed365c15c16d1f11ffd66a2ee39340c7979d 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -73,7 +73,8 @@ dep_tristate 'old DAS16 driver' CONFIG_COMEDI_DAS16_OLD $CONFIG_COMEDI
 dep_tristate 'DAS-6402 and compatibles' CONFIG_COMEDI_DAS6402 $CONFIG_COMEDI
 dep_tristate 'DAS-800 and compatibles' CONFIG_COMEDI_DAS800 $CONFIG_COMEDI
 dep_tristate 'DAS-1800 and compatibles' CONFIG_COMEDI_DAS1800 $CONFIG_COMEDI
-dep_tristate 'Computer Boards PCI-DAS 1200 series' CONFIG_COMEDI_CB_PCIDAS $CONFIG_COMEDI
+dep_tristate 'Computer Boards PCI-DAS series' CONFIG_COMEDI_CB_PCIDAS $CONFIG_COMEDI
+dep_tristate 'Computer Boards PCI-DDA series' CONFIG_COMEDI_CB_PCIDDA $CONFIG_COMEDI
 dep_tristate 'Generic 8255 support' CONFIG_COMEDI_8255 $CONFIG_COMEDI
 dep_tristate 'Quanser Consulting MultiQ-3' CONFIG_COMEDI_MULTIQ3 $CONFIG_COMEDI
 dep_tristate 'Generic parallel port support' CONFIG_COMEDI_PARPORT $CONFIG_COMEDI

diff --git a/comedi/drivers/Makefile b/comedi/drivers/Makefile
index cebb99f779c19f90b69ec56a2dd97f70a9daa19c..e9b05e90640d869b706a77633c2ce149597b5b54 100644 (file)
--- a/comedi/drivers/Makefile
+++ b/comedi/drivers/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_COMEDI_ADL_PCI9118)      += adl_pci9118.o
 obj-$(CONFIG_COMEDI_ADV_PCI1710)       += adv_pci1710.o
 
 obj-$(CONFIG_COMEDI_CB_PCIDAS)         += cb_pcidas.o
+obj-$(CONFIG_COMEDI_CB_PCIDDA)         += cb_pcidda.o
 
 obj-$(CONFIG_COMEDI_DAQBOARD2000)      += daqboard2000.o