From: David Schleef <ds@schleef.org>
Date: Wed, 20 Mar 2002 19:57:29 +0000 (+0000)
Subject: Remove 6115, since it probably can't be supported easily.
X-Git-Tag: r0_7_64~32
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=63364dcb8ebeb80fa1376f85fe2ce818de2797d1;p=comedi.git

Remove 6115, since it probably can't be supported easily.
---

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 0489f899..fd8af861 100644
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -28,8 +28,8 @@ Devices: [National Instruments] PCI-MIO-16XE-50 (ni_pcimio),
   PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1, PCI-MIO-16E-4, PCI-6040E,
   PXI-6040E, PCI-6031E, PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E,
   PCI-6024E, PCI-6025E, PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E,
-  PCI-6110, PCI-6111, PCI-6115, PXI-6115, PCI-6711, PCI-6713,
-  PXI-6071E, PXI-6070E, PXI-6052E, PCI-6036E, PCI-6731, PCI-6733
+  PCI-6110, PCI-6111, PCI-6711, PCI-6713, PXI-6071E, PXI-6070E,
+  PXI-6052E, PCI-6036E, PCI-6731, PCI-6733
 Updated: Sat, 16 Mar 2002 17:34:48 -0800
 
 These boards are almost identical to the AT-MIO E series, except that
@@ -455,6 +455,8 @@ static ni_board ni_boards[]={
 		reg_611x:	1,
 		caldac:         {ad8804_debug,ad8804_debug,ad8804_debug},/* XXX */
 	},
+#if 0
+	/* The 6115 boards probably need their own driver */
 	{       device_id:      0x2ed0,
 		name:           "pci-6115",
 		n_adchan:       4,
@@ -471,6 +473,7 @@ static ni_board ni_boards[]={
 		reg_611x:	1,
 		caldac:         {ad8804_debug,ad8804_debug,ad8804_debug},/* XXX */
 	},
+#endif
 #if 0
 	{       device_id:      0x0000,
 		name:           "pxi-6115",