From: David Schleef <ds@schleef.org>
Date: Thu, 28 Jun 2001 23:33:11 +0000 (+0000)
Subject: Heh.  revert change to config.in and apply to config.dist
X-Git-Tag: r0_7_60~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59307ba778747dbb5541a49deafa4acd12a8269c;p=comedi.git

Heh.  revert change to config.in and apply to config.dist
---

diff --git a/scripts/config.dist b/scripts/config.dist
index 7aabd0d8..1ba23211 100644
--- a/scripts/config.dist
+++ b/scripts/config.dist
@@ -7,8 +7,7 @@ CONFIG_COMEDI=m
 # Comedi Features
 #
 CONFIG_COMEDI_TRIG=y
-CONFIG_COMEDI_RT=y
-CONFIG_COMEDI_RTAI=y
+# CONFIG_COMEDI_RT is not set
 CONFIG_COMEDI_DEBUG=y
 CONFIG_COMEDI_KLIB=m
 
@@ -32,15 +31,16 @@ CONFIG_COMEDI_MITE=m
 CONFIG_COMEDI_NI_ATMIO16D=m
 CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS16M1=m
 # CONFIG_COMEDI_DAS08_OLD is not set
 # CONFIG_COMEDI_DAS08JR_OLD is not set
 # CONFIG_COMEDI_DAS1600_OLD is not set
 # CONFIG_COMEDI_DAS16_OLD is not set
-# CONFIG_COMEDI_DAS1600_OLD is not set
 CONFIG_COMEDI_DAS6402=m
 CONFIG_COMEDI_DAS800=m
 CONFIG_COMEDI_DAS1800=m
 CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_PARPORT=m
@@ -61,6 +61,6 @@ CONFIG_COMEDI_DAQBOARD2000=m
 # CONFIG_COMEDI_DAQBOARD2000_FPGA is not set
 CONFIG_COMEDI_FL512=m
 CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_PCM3730=m
 CONFIG_COMEDI_PCMAD=m
 CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_RT_TIMER=m
diff --git a/scripts/config.in b/scripts/config.in
index 1ba23211..b2c119e7 100644
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,66 +1,4 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_COMEDI=m
 
-#
-# Comedi Features
-#
-CONFIG_COMEDI_TRIG=y
-# CONFIG_COMEDI_RT is not set
-CONFIG_COMEDI_DEBUG=y
-CONFIG_COMEDI_KLIB=m
+# XXX change here
+source comedi/Config.in
 
-#
-# Hardware device drivers
-#
-CONFIG_COMEDI_DT=y
-CONFIG_COMEDI_DT2801=m
-CONFIG_COMEDI_DT2811=m
-CONFIG_COMEDI_DT2814=m
-CONFIG_COMEDI_DT2815=m
-CONFIG_COMEDI_DT2817=m
-CONFIG_COMEDI_DT282x=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_NI=y
-CONFIG_COMEDI_NI_ATMIO=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_ATMIO16D=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_DAS16=m
-CONFIG_COMEDI_DAS16M1=m
-# CONFIG_COMEDI_DAS08_OLD is not set
-# CONFIG_COMEDI_DAS08JR_OLD is not set
-# CONFIG_COMEDI_DAS1600_OLD is not set
-# CONFIG_COMEDI_DAS16_OLD is not set
-CONFIG_COMEDI_DAS6402=m
-CONFIG_COMEDI_DAS800=m
-CONFIG_COMEDI_DAS1800=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
-CONFIG_COMEDI_PCL726=m
-CONFIG_COMEDI_PCL812=m
-CONFIG_COMEDI_PCL818=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_RTI800=m
-CONFIG_COMEDI_RTI802=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_QUATECH_DAQP=m
-CONFIG_COMEDI_DAQBOARD2000=m
-# CONFIG_COMEDI_DAQBOARD2000_FPGA is not set
-CONFIG_COMEDI_FL512=m
-CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCM3730=m
-CONFIG_COMEDI_PCMAD=m
-CONFIG_COMEDI_SKEL=m