From f3128a41f03c01e905c90e2f9bd0fcacaeef0326 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 11 May 2012 10:53:44 +0100 Subject: [PATCH] devices.txt: Removed duplicate entry caused by merge. I forgot to "git pull" before updating devices.txt locally, so the "git merge" merged in Bernd's changes to devices.txt from master. This lead to a duplicate entry for ITL USB-DUX usbduxsigma. I'm fixing the dupe by copying over the devices.txt built from comedi.git again. --- devices.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/devices.txt b/devices.txt index 7091d62..b4fd41d 100644 --- a/devices.txt +++ b/devices.txt @@ -172,7 +172,6 @@ ICP P16R16DIO acl7225b p16r16dio Inova ICP_MULTI icp_multi icp_multi Intelligent Instrumentation PCI-20001C ii_pci20kc ii_pci20kc IOTech DAQBoard/2000 daqboard2000 daqboard2000 -ITL USB-DUX usbduxsigma usbduxsigma.o ITL USB-DUX usbduxfast usbduxfast.o ITL USB-DUX usbduxsigma usbduxsigma.o ITL USB-DUX usbdux usbdux.o