Add new amplicon drivers

diff --git a/comedi/Config.in b/comedi/Config.in
index cf155b147475224de156547fb1b186710c4abab3..4484f9841aac31b6717b98e67ad44b9cd92ad12f 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -118,6 +118,8 @@ dep_tristate 'Generic ISA driver for simple boards' CONFIG_COMEDI_POC $CONFIG_CO
 dep_tristate 'PCM3730' CONFIG_COMEDI_PCM3730 $CONFIG_COMEDI
 dep_tristate 'Winsystems PCM-A/D' CONFIG_COMEDI_PCMAD $CONFIG_COMEDI
 dep_tristate 'Amplicon PCI230' CONFIG_COMEDI_AMPLC_PCI230 $CONFIG_COMEDI
+dep_tristate 'Amplicon PC36AT/PCI236' CONFIG_COMEDI_AMPLC_PC236 $CONFIG_COMEDI
+dep_tristate 'Amplicon PC263/PCI263' CONFIG_COMEDI_AMPLC_PC263 $CONFIG_COMEDI
 dep_tristate 'SSV DIL/Net PC driver' CONFIG_COMEDI_SSV_DNP $CONFIG_COMEDI
 dep_tristate 'Inova ICP Multi' CONFIG_COMEDI_ICP_MULTI $CONFIG_COMEDI
 dep_tristate 'Comedi test driver' CONFIG_COMEDI_TEST $CONFIG_COMEDI

diff --git a/comedi/drivers/Makefile.in b/comedi/drivers/Makefile.in
index 5db14d5e38268da1d88d5a0aadc8087278173da0..0a6af66169b287ce328be655ace3d2c0bf59f2e4 100644 (file)
--- a/comedi/drivers/Makefile.in
+++ b/comedi/drivers/Makefile.in
@@ -6,6 +6,8 @@ select(CONFIG_COMEDI_ADL_PCI9111 adl_pci9111.o)
 select(CONFIG_COMEDI_ADL_PCI9118 adl_pci9118.o amcc_s5933.o)
 select(CONFIG_COMEDI_ADV_PCI1710 adv_pci1710.o amcc_s5933.o)
 select(CONFIG_COMEDI_AMPLC_PCI230 amplc_pci230.o)
+select(CONFIG_COMEDI_AMPLC_PC236 amplc_pc236.o)
+select(CONFIG_COMEDI_AMPLC_PC263 amplc_pc263.o)
 select(CONFIG_COMEDI_CB_PCIDAS cb_pcidas.o)
 select(CONFIG_COMEDI_CB_PCIDAS64 cb_pcidas64.o)
 select(CONFIG_COMEDI_CB_PCIDDA cb_pcidda.o)

diff --git a/scripts/config.dist b/scripts/config.dist
index 8f495f4a328b54f8ddb9efc04de04a387bc52dbc..c96c66ae63285174d2cfb9c35d6513dec740e9f1 100644 (file)
--- a/scripts/config.dist
+++ b/scripts/config.dist
@@ -6,7 +6,6 @@ CONFIG_COMEDI=m
 #
 # Comedi Features
 #
-# CONFIG_COMEDI_RTAI is not set
 # CONFIG_COMEDI_RT is not set
 CONFIG_COMEDI_DEBUG=y
 CONFIG_COMEDI_KLIB=m
@@ -43,6 +42,7 @@ CONFIG_COMEDI_DAS1800=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_PARPORT=m
@@ -69,7 +69,10 @@ CONFIG_COMEDI_POC=m
 CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_PCMAD=m
 CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_ICP_MULTI=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_FC=m